Merge lp:~brandontschaefer/unity/lp.1108956-fix-again into lp:unity

[Brandon Schaefer]

If are in the Command Prompt (Alt+F2) go to the Home.Lens when pressing super or clicking the launcher icon.

=== Problem ===
You must be able to go from the Command Prompt (Alt+F2) to the Home Lens.

=== Fix ===
If we receive a UBUS_PLACE_ENTRY_ACTIVATE_REQUEST, and the command lens is active. Activate that lens instead of closing the dash. As the command lens is not really a lens and should not be treated as if the dash is open. It should be treated as if it were another overlay like the Hud.

=== Test ===
AP test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3298
http://jenkins.qa.ubuntu.com/job/unity-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/3
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/3

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

review: Needs Fixing (continuous-integration)

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

+1

review: Approve

[Brandon Schaefer (brandontschaefer)]

Ill have to look into redoing this again.... :(

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

Any new work on this? :)

Unmerged revisions

3298. By Brandon Schaefer on 2013-04-11

* If the command lens is active, and we get a super press or launcher icon click
  that is trying to open the home.lens, then switch to the home lens instead of
  closing the dash.

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-04-10 18:26:42 +0000
+++ dash/DashView.cpp	2013-04-11 18:16:25 +0000
@@ -1140,12 +1140,19 @@
     lens_bar_->Activate(id);
     ubus_manager_.SendMessage(UBUS_DASH_EXTERNAL_ACTIVATION);
   }
-  else if (/* visible_ && */ handled_type == NOT_HANDLED)
+  else if (handled_type == NOT_HANDLED)
   {
-    ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST, NULL,
-                              glib::Source::Priority::HIGH);
+    if (lens_bar_->GetActiveLensId() == "commands.lens")
+    {
+      lens_bar_->Activate(id);
+    }
+    else
+    {
+      ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST, NULL,
+                                glib::Source::Priority::HIGH);
+    }
   }
-  else if (/* visible_ && */ handled_type == GOTO_DASH_URI)
+  else if (handled_type == GOTO_DASH_URI)
   {
     lens_bar_->Activate(id);
   }
 
=== modified file 'tests/autopilot/unity/emulators/dash.py'
--- tests/autopilot/unity/emulators/dash.py	2013-04-08 20:27:29 +0000
+++ tests/autopilot/unity/emulators/dash.py	2013-04-11 18:16:25 +0000
@@ -63,6 +63,12 @@
         """
         Ensures the dash is hidden.
         """
+
+        # the command lens is special, and needs 2 super presses to exit lp.1108956
+        if self.active_lens == "commands.lens":
+            self.keybinding("dash/reveal", 0.1)
+            self.visible.wait_for(True)
+
         if self.visible:
             self.toggle_reveal()
             self.visible.wait_for(False)
@@ -85,7 +91,6 @@
     def preview_animation(self):
         """Returns the average progress of dash slip and animating a preview.
         Between 0.0 and 1.0.
-        
         """
         return self.view.preview_animation;
 
 
=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2013-04-10 18:26:42 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2013-04-11 18:16:25 +0000
@@ -76,8 +76,18 @@
         """Switch to command lens without closing the dash."""
         self.unity.dash.ensure_visible()
         self.unity.dash.reveal_command_lens()
+        self.assertThat(self.unity.dash.visible, Eventually(Equals(True)))
         self.assertThat(self.unity.dash.active_lens, Eventually(Equals('commands.lens')))
 
+    def test_can_go_from_command_lens_to_dash(self):
+        """We must be able to go from the command lens to the dash (home lens)."""
+        self.unity.dash.reveal_command_lens()
+
+        # Since the dash is visible we can't use ensure_visible().
+        self.keybinding("dash/reveal", 0.1)
+        self.assertThat(self.unity.dash.visible, Eventually(Equals(True)))
+        self.assertThat(self.unity.dash.active_lens, Eventually(Equals('home.lens')))
+
     def test_command_lens_can_close_itself(self):
         """We must be able to close the Command lens with Alt+F2"""
         self.unity.dash.reveal_command_lens()