Merge lp:~feng-kylin/unity8/adjustColorToHighlightingIndicator into lp:unity8

[handsome_feng]

Adjust the color to highlighting indicator.

* Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * 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?

no

[Nick Dedekind (nick-dedekind)]

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

 * Did CI run pass? If not, please explain why.
Has not run

 * Did you make sure that the branch does not contain spurious tags?
Tags in trunk.

review: Approve

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2015-07-01 11:08:59 +0000
+++ qml/Panel/IndicatorItem.qml	2015-08-04 07:10:48 +0000
@@ -31,9 +31,9 @@
     property bool selected: false
     property real iconHeight: units.gu(2)
     readonly property color color: {
-        if (!expanded) return "#ededed";
-        if (!selected) return "#4c4c4c";
-        return "#ededed";
+        if (!expanded) return "#ffffff";
+        if (!selected) return "#888888";
+        return "#ffffff";
     }
 
     signal clicked()

=== modified file 'qml/Panel/IndicatorItemRow.qml'
--- qml/Panel/IndicatorItemRow.qml	2014-10-17 14:55:35 +0000
+++ qml/Panel/IndicatorItemRow.qml	2015-08-04 07:10:48 +0000
@@ -31,7 +31,7 @@
     property real unitProgress: 0.0
     property real selectionChangeBuffer: units.gu(2)
     property bool enableLateralChanges: false
-    property color hightlightColor: "#ededed"
+    property color hightlightColor: "#ffffff"
 
     property real lateralPosition: -1
     onLateralPositionChanged: {

=== modified file 'qml/Panel/IndicatorsBar.qml'
--- qml/Panel/IndicatorsBar.qml	2014-12-03 10:57:01 +0000
+++ qml/Panel/IndicatorsBar.qml	2015-08-04 07:10:48 +0000
@@ -123,7 +123,7 @@
         width: parent.width
         anchors.bottom: parent.bottom
 
-        color: "#4c4c4c"
+        color: "#888888"
         opacity: expanded ? 1.0 : 0.0
         Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }
     }

=== modified file 'tests/qmltests/Panel/tst_IndicatorItem.qml'
--- tests/qmltests/Panel/tst_IndicatorItem.qml	2014-10-06 09:17:49 +0000
+++ tests/qmltests/Panel/tst_IndicatorItem.qml	2015-08-04 07:10:48 +0000
@@ -181,25 +181,25 @@
         }
 
         function test_select() {
-            tryCompare(findChild(indicatorItem, "icon0"), "color", "#ededed");
+            tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");
             tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
-            tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ededed");
-            tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ededed");
-            tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ededed");
+            tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");
+            tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");
+            tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");
 
             indicatorItem.expanded = true;
-            tryCompare(findChild(indicatorItem, "icon0"), "color", "#4c4c4c");
+            tryCompare(findChild(indicatorItem, "icon0"), "color", "#888888");
             tryCompare(findChild(indicatorItem, "icon0"), "opacity", 0.6);
-            tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#4c4c4c");
-            tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#4c4c4c");
-            tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#4c4c4c");
+            tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#888888");
+            tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#888888");
+            tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#888888");
 
             indicatorItem.selected = true;
-            tryCompare(findChild(indicatorItem, "icon0"), "color", "#ededed");
+            tryCompare(findChild(indicatorItem, "icon0"), "color", "#ffffff");
             tryCompare(findChild(indicatorItem, "icon0"), "opacity", 1.0);
-            tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ededed");
-            tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ededed");
-            tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ededed");
+            tryCompare(findChild(indicatorItem, "leftLabel"), "color", "#ffffff");
+            tryCompare(findChild(indicatorItem, "rightLabel"), "color", "#ffffff");
+            tryCompare(findChild(indicatorItem, "indicatorName"), "color", "#ffffff");
         }
     }
 }