Merge lp:~aacid/unity-2d/launcher_tile_selection_color into lp:unity-2d

[Albert Astals Cid]

[Launcher] Fix the background of the tile being "highlighted" when it should not

Fix the background of the tile being "highlighted" when it should not
UNBLOCK

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'shell/launcher/LauncherItem.qml'
--- shell/launcher/LauncherItem.qml	2012-04-03 15:11:46 +0000
+++ shell/launcher/LauncherItem.qml	2012-04-19 11:20:24 +0000
@@ -202,7 +202,7 @@
                 height: item.tileSize
                 anchors.centerIn: parent
 
-                activeFocus: item.activeFocus
+                activeFocus: declarativeView.focus && item.activeFocus
                 backgroundFromIcon: item.backgroundFromIcon
 
                 source: (beHudItem && hudLoader) ? hudLoader.item.appIcon : item.icon
 
=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-04-17 16:07:36 +0000
+++ tests/manual-tests/launcher.txt	2012-04-19 11:20:24 +0000
@@ -130,3 +130,11 @@
 
 Verify that the tile that appears in the launcher has the app icon and not the questionmark icon
 ----
+
+ * Alt+f1 to show launcher
+ * move down with arrow key
+ * press enter to start/focus a program (firefox works particulary well due to its red background)
+ * press Alt+f1 again
+
+Verify that the tile of the program you started (e.g. firefox) does not have the background highlighted
+----