Merge lp:~azzar1/unity/fix-839717 into lp:unity

[Andrea Azzarone]

Unfold valid drop icons.

== Problem ==
Launcher - when a user starts dragging a item, any folded launcher icons that are valid drop receptacles should unfold.

== Fix ==
Use QUIRK_PRESENT to unfold a valid target icon.

== Test ==
Manual test added.

http://ubuntuone.com/0B37q9nf0vcjxVMojeSMvN

[Marco Trevisan (Treviño) (3v1n0)]

With manual test is now good. +1

review: Approve

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:2473
http://jenkins.qa.ubuntu.com/job/unity-ci/61/

review: Approve (continuous-integration)

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in manual-tests/Launcher.txt

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-07-10 13:52:21 +0000
+++ launcher/Launcher.cpp	2012-07-10 15:54:18 +0000
@@ -2591,6 +2591,7 @@
       {
         it->SetQuirk(AbstractLauncherIcon::QUIRK_DESAT, false);
         it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, true);
+        it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, true);
       }
       else
       {
@@ -2625,6 +2626,7 @@
   {
     it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, false);
     it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_DIM, false);
+    it->SetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED, false);
   }
 
   DndHoveredIconReset();

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-07-09 17:28:59 +0000
+++ manual-tests/Launcher.txt	2012-07-10 15:54:18 +0000
@@ -606,3 +606,20 @@
 Expected Result:
 Unity must not freeze during the drag and drop.
 
+
+Test launcher unfolds valid drop icons during dnd
+------------------------------------------------------------
+This test makes sure that Unity launcher unfolds valid drop icons during
+drag and drop.
+
+Setup:
+ * Add icons to the laucnher so that some of them in the bottom are folded.
+ * Add Nautilus icon too, making sure it is folded.
+
+Actions:
+ * Show Desktop
+ * Drag a folder icon
+
+Expected Results:
+ * All the valid drop icons should unfold during the drag and drop.
+