Merge lp:~unity-team/unity8/indicator-color-fixes into lp:unity8

[Michał Sawicz]

Fixed colours palette value set. Moved ModemItem to USC.

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20/+merge/283385
https://code.launchpad.net/~nick-dedekind/ubuntu-settings-components/indicator-color-fixes/+merge/285702

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
Yes

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2145
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/214/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/214/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2145
http://jenkins.qa.ubuntu.com/job/unity8-ci/7164/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/579/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1869
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/570
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4795/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6233
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27079
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/298/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/577
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/577/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27078

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7164/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

I guess we need to increase the USC dependency?

review: Needs Information

[Zsombor Egri (zsombi)]

Please also update to use palette.disabled instead of palette.inactive valueset. Silo 050 shoudl already have these values there.

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

> Please also update to use palette.disabled instead of palette.inactive
> valueset. Silo 050 shoudl already have these values there.

Done.

[Nick Dedekind (nick-dedekind)]

> Please also update to use palette.disabled instead of palette.inactive
> valueset. Silo 050 shoudl already have these values there.

Done.

[Nick Dedekind (nick-dedekind)]

> I guess we need to increase the USC dependency?

done

[Zsombor Egri (zsombi)]

I am good with the colors. I see in few places the use of UbuntuColors instead of palette colors, but that may be a design request, so it's good to go. In case those should be themed, those should be checked again with design.

review: Approve

[Albert Astals Cid (aacid)]

Code looks good, waiting on silo to be available to do testing.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2148
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/526/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/691/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/714
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/732
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/732
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/728/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/526/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Testing looks good

review: Approve

[Michał Sawicz (saviq)]

Approving as per the superseded MP.

The diff² is s/SuruGradient/SuruDark/ that happened in lp:~ubuntu-sdk-team/unity8/unity-theme instead.

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-02-19 12:42:44 +0000
+++ debian/control	2016-03-04 21:01:30 +0000
@@ -54,7 +54,7 @@
                qtdeclarative5-private-dev (>= 5.4),
                qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
                qtdeclarative5-ubuntu-content1,
-               qtdeclarative5-ubuntu-settings-components (>= 0.6),
+               qtdeclarative5-ubuntu-settings-components (>= 0.7),
                qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
                qtdeclarative5-ubuntu-web-plugin,
                ttf-ubuntu-font-family,
@@ -126,7 +126,7 @@
 Package: unity8-common
 Architecture: all
 Depends: qml-module-qtquick-layouts,
-         qtdeclarative5-ubuntu-settings-components (>= 0.6),
+         qtdeclarative5-ubuntu-settings-components (>= 0.7),
          qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

=== modified file 'qml/Panel/Handle.qml'
--- qml/Panel/Handle.qml	2015-11-25 14:10:22 +0000
+++ qml/Panel/Handle.qml	2016-03-04 21:01:30 +0000
@@ -19,7 +19,7 @@
 
 Rectangle {
     id: handle
-    color: "#5d5d5d"
+    color: UbuntuColors.slate
     height: units.gu(2)
     property bool active: false
 
@@ -35,7 +35,7 @@
                 id: dot
                 width: units.dp(3)
                 height: width
-                color: handle.active ? UbuntuColors.orange : "#888888"
+                color: handle.active ? UbuntuColors.orange : UbuntuColors.ash
                 radius: units.dp(1)
             }
         }

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2016-01-05 06:09:56 +0000
+++ qml/Panel/IndicatorItem.qml	2016-03-04 21:01:30 +0000
@@ -32,9 +32,9 @@
     property bool selected: false
     property real iconHeight: units.gu(2)
     readonly property color color: {
-        if (!expanded) return "#ffffff";
-        if (!selected) return "#888888";
-        return "#ffffff";
+        if (!expanded) return theme.palette.normal.backgroundText;
+        if (!selected) return theme.palette.disabled.backgroundText;
+        return theme.palette.normal.backgroundText;
     }
 
     implicitWidth: mainItems.width

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2016-01-11 17:36:56 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2016-03-04 21:01:30 +0000
@@ -261,7 +261,7 @@
                     name: "settings"
                     height: units.gu(3)
                     width: height
-                    color: theme.palette.selected.backgroundText
+                    color: theme.palette.normal.backgroundText
                 }
             }
         }
@@ -293,7 +293,7 @@
                     source: menuData.icon
                     height: units.gu(3)
                     width: height
-                    color: theme.palette.selected.backgroundText
+                    color: theme.palette.normal.backgroundText
                 }
             }
         }
@@ -620,7 +620,7 @@
 
     Component {
         id: modeminfoitem;
-        ModemInfoItem {
+        Menus.ModemInfoItem {
             objectName: "modemInfoItem"
             property QtObject menuData: null
             property var menuModel: menuFactory.menuModel

=== removed file 'qml/Panel/Indicators/ModemInfoItem.qml'
--- qml/Panel/Indicators/ModemInfoItem.qml	2015-07-15 15:13:18 +0000
+++ qml/Panel/Indicators/ModemInfoItem.qml	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright 2014,2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
-
-ListItem.Empty {
-    id: menu
-    implicitHeight:   mainColumn.implicitHeight
-                    + mainColumn.anchors.topMargin
-                    + mainColumn.anchors.bottomMargin
-
-    property alias statusIcon: statusIcon.name
-    property alias statusText: labelStatus.text
-    property alias connectivityIcon: iconConnectivity.name
-    property alias simIdentifierText: labelSimIdentifier.text
-    property bool locked : false
-    property bool roaming: false
-    signal unlock
-
-    ColumnLayout {
-        id: mainColumn
-        anchors.fill: parent
-        anchors.margins: menu.__contentsMargins
-        spacing: units.gu(0.5)
-
-        Label {
-            id: labelSimIdentifier
-            elide: Text.ElideRight
-            visible: text !== ""
-            font.bold: true
-            opacity: menu.locked ? 0.6 : 1.0
-        }
-
-        RowLayout {
-            id: statusRow
-            spacing: units.gu(1)
-
-            height: labelStatus.height
-            width: parent.width
-
-            Label {
-                id: labelStatus
-                elide: Text.ElideRight
-                opacity: 0.6
-            }
-
-            RowLayout {
-                spacing: 0.5
-                height: parent.height
-                Icon {
-                    id: statusIcon
-                    color: theme.palette.selected.backgroundText
-
-                    Layout.preferredHeight: parent.height
-                    Layout.preferredWidth: Layout.preferredHeight
-
-                    visible: name !== ""
-                }
-
-                Icon {
-                    id: iconConnectivity
-                    color: theme.palette.selected.backgroundText
-
-                    Layout.preferredHeight: parent.height
-                    Layout.preferredWidth: Layout.preferredHeight
-
-                    visible: name !== ""
-                }
-            }
-
-            Item {
-                // eat up all the excess space so that RoamingIndication
-                // ends up to the far right
-                Layout.fillWidth: true
-            }
-
-            RoamingIndication {
-                id: roamingIndication
-                visible: menu.roaming
-                Layout.fillHeight: true
-            }
-        }
-
-        Button {
-            id: buttonUnlock
-            objectName: "buttonUnlockSim"
-            visible: menu.locked
-
-            text: i18n.tr("Unlock SIM")
-            Layout.preferredWidth: implicitWidth + units.gu(5)
-
-            onTriggered: menu.unlock()
-        }
-    }
-}

=== removed file 'qml/Panel/Indicators/RoamingIndication.qml'
--- qml/Panel/Indicators/RoamingIndication.qml	2015-07-15 15:13:18 +0000
+++ qml/Panel/Indicators/RoamingIndication.qml	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright 2014,2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
-
-RowLayout {
-    spacing: units.gu(0.5)
-    Label {
-        id: labelRoaming
-        elide: Text.ElideRight
-        fontSize: "x-small"
-        text: i18n.tr("Roaming")
-        opacity: 0.6
-    }
-
-    Icon {
-        id: iconRoaming
-        color: theme.palette.selected.backgroundText
-
-        Layout.preferredHeight: parent.height
-        Layout.preferredWidth: Layout.preferredHeight
-
-        name: "network-cellular-roaming"
-    }
-}

=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2015-11-26 13:51:53 +0000
+++ qml/Panel/IndicatorsMenu.qml	2016-03-04 21:01:30 +0000
@@ -38,7 +38,7 @@
     property bool enableHint: true
     property bool contentEnabled: true
     property bool showOnClick: true
-    property color panelColor: "#292929"
+    property color panelColor: theme.palette.normal.background
 
     signal showTapped(point position)
 
@@ -76,6 +76,7 @@
     MenuContent {
         id: content
         objectName: "menuContent"
+        color: root.panelColor
 
         anchors {
             left: parent.left
@@ -110,7 +111,7 @@
             height: units.gu(0.5)
             gradient: Gradient {
                 GradientStop { position: 0.0; color: "transparent" }
-                GradientStop { position: 1.0; color: "#292929" }
+                GradientStop { position: 1.0; color: root.panelColor }
             }
             opacity: 0.3
         }

=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2015-11-25 13:57:34 +0000
+++ qml/Panel/MenuContent.qml	2016-03-04 21:01:30 +0000
@@ -27,7 +27,7 @@
 
     property QtObject indicatorsModel: null
     property int currentMenuIndex: -1
-    color: "#292929" // FIXME not in palette yet
+    color: theme.palette.normal.background
 
     width: units.gu(40)
     height: units.gu(42)

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-11-25 13:57:34 +0000
+++ qml/Panel/Panel.qml	2016-03-04 21:01:30 +0000
@@ -89,7 +89,7 @@
 
         Rectangle {
             id: indicatorAreaBackground
-            color: callHint.visible ? "green" : "#292929"
+            color: callHint.visible ? UbuntuColors.green : theme.palette.normal.background
             anchors {
                 top: parent.top
                 left: parent.left

=== modified file 'tests/qmltests/Panel/tst_IndicatorItem.qml'
--- tests/qmltests/Panel/tst_IndicatorItem.qml	2015-08-13 09:08:15 +0000
+++ tests/qmltests/Panel/tst_IndicatorItem.qml	2016-03-04 21:01:30 +0000
@@ -24,7 +24,9 @@
 Rectangle {
     width: units.gu(80)
     height: units.gu(30)
-    color: "white"
+    color: theme.palette.normal.background
+
+    Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark"
 
     RowLayout {
         anchors.fill: parent
@@ -37,7 +39,7 @@
             Layout.fillHeight: true
 
             Rectangle {
-                color: "black"
+                color: theme.palette.normal.background
                 anchors.fill: indicatorItem
             }
 
@@ -181,25 +183,25 @@
         }
 
         function test_select() {
-            tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");
+            tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
             tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
-            tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");
-            tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");
-            tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");
+            tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
+            tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
+            tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
 
             indicatorItem.expanded = true;
-            tryCompare(findChild(indicatorItem, "icon0"), "color", "#888888");
+            tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.disabled.backgroundText);
             tryCompare(findChild(indicatorItem, "icon0"), "opacity", 0.6);
-            tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#888888");
-            tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#888888");
-            tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#888888");
+            tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.disabled.backgroundText);
+            tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.disabled.backgroundText);
+            tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.disabled.backgroundText);
 
             indicatorItem.selected = true;
-            tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");
+            tryCompare(findChild(indicatorItem, "icon0"), "color", theme.palette.normal.backgroundText);
             tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
-            tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");
-            tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");
-            tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");
+            tryCompare(findChild(indicatorItem, "leftLabel"), "color", theme.palette.normal.backgroundText);
+            tryCompare(findChild(indicatorItem, "rightLabel"), "color", theme.palette.normal.backgroundText);
+            tryCompare(findChild(indicatorItem, "indicatorName"), "color", theme.palette.normal.backgroundText);
         }
     }
 }

=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2015-11-18 15:12:56 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2016-03-04 21:01:30 +0000
@@ -31,6 +31,8 @@
     height: units.gu(71)
     color: "white"
 
+    Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark"
+
     Binding {
         target: mouseEmulation
         property: "checked"