Merge lp:~brandontschaefer/unity/command-to-dash-fix into lp:unity

[Brandon Schaefer]

When we get a launcher key press (ie. super key). We check if the command lens is open. If it is then just switch the lens to the home lens. This way we dont close the dash.

When we get a launcher key press (ie. super key). We check if the command lens is open. If it is then just switch the lens to the home lens. This way we dont close the dash.

[Christopher Townsend (townsend)]

Yep, seems to work now. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3937
http://jenkins.qa.ubuntu.com/job/unity-ci/1178/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/65

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

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

This change causes a whole slew of Autopilot tests to fail because they rely on the Super key to close the command lens.

Evidently the test suite was not run before submitting this merge proposal.

The test suite should be changed to use the escape key (or hide_dash_via_dbus()) to close the dash after the test has completed, since it was relying on incorrect behaviour previously.

review: Needs Fixing

[Stephen M. Webb (bregma)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-03-05 16:35:54 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-04-10 16:33:35 +0000
@@ -2121,6 +2121,12 @@
                                   g_variant_new("(sus)", "home.scope", dash::GOTO_DASH_URI, ""));
       }
     }
+    else if (dash_controller_->IsCommandLensOpen())
+    {
+      tap_handled = true;
+      ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                                g_variant_new("(sus)", "home.scope", dash::GOTO_DASH_URI, ""));
+    }
     else
     {
       dash_controller_->HideDash();

=== modified file 'tests/autopilot/unity/emulators/dash.py'
--- tests/autopilot/unity/emulators/dash.py	2013-05-19 07:25:11 +0000
+++ tests/autopilot/unity/emulators/dash.py	2015-04-10 16:33:35 +0000
@@ -70,7 +70,7 @@
         Ensures the dash is hidden.
         """
         if self.visible:
-            self.toggle_reveal()
+            self.hide_dash_via_dbus()
             self.visible.wait_for(False)
 
     @property