Merge lp:~3v1n0/unity/super-tab-arrows into lp:unity

[Marco Trevisan (Treviño)]

Added support for Up/Down arrow keys to change the selected launcher icon when using the Super+Tab

This fixes the bug #950404

On the test sides, I've used autopilot to test this particular fix, also I've made some changes to the launcher emulator, to make it handle in a better way the Launcher key navigation and the Launcher Switcher as two different kinds of key navigation. This should avoid any confusion and cleans the code.

[Thomi Richards (thomir-deactivatedaccount)]

Nice - I've been meaning to do something like this for aaaages. Cheers,

review: Approve

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-03-10 00:19:22 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-03-10 00:19:22 +0000
@@ -876,7 +876,8 @@
   {
     /* Create a new keybinding for the Escape key and the current modifiers,
      * compiz will take of the ref-counting of the repeated actions */
-    CompAction::KeyBinding binding(9, modifiers);
+    KeyCode escape = XKeysymToKeycode(screen->dpy(), XStringToKeysym("Escape"));
+    CompAction::KeyBinding binding(escape, modifiers);
 
     CompActionPtr &escape_action = _escape_actions[target];
     escape_action = CompActionPtr(new CompAction());
@@ -1347,12 +1348,28 @@
       KeySym key_sym;
       char key_string[2];
       int result = XLookupString(&(event->xkey), key_string, 2, &key_sym, 0);
+
+      if (launcher_controller_->KeyNavIsActive())
+      {
+        if (key_sym == XK_Up)
+        {
+          launcher_controller_->KeyNavPrevious();
+          break;
+        }
+        else if (key_sym == XK_Down)
+        {
+          launcher_controller_->KeyNavNext();
+          break;
+        }
+      }
+
       if (result > 0)
       {
         // NOTE: does this have the potential to do an invalid write?  Perhaps
         // we should just say "key_string[1] = 0" because that is the only
         // thing that could possibly make sense here.
         key_string[result] = 0;
+
         if (super_keypressed_)
         {
           if (key_sym != XK_Escape || (key_sym == XK_Escape && !launcher_controller_->KeyNavIsActive()))
@@ -1764,8 +1781,22 @@
 {
   if (!launcher_controller_->KeyNavIsActive())
   {
+    int modifiers = action->key().modifiers();
+
     launcher_controller_->KeyNavActivate();
-    EnableCancelAction(CancelActionTarget::LAUNCHER_SWITCHER, true, action->key().modifiers());
+
+    EnableCancelAction(CancelActionTarget::LAUNCHER_SWITCHER, true, modifiers);
+
+    KeyCode down_key = XKeysymToKeycode(screen->dpy(), XStringToKeysym("Down"));
+    KeyCode up_key = XKeysymToKeycode(screen->dpy(), XStringToKeysym("Up"));
+
+    CompAction down_action;
+    down_action.setKey(CompAction::KeyBinding(down_key, modifiers));
+    screen->addAction(&down_action);
+
+    CompAction up_action;
+    up_action.setKey(CompAction::KeyBinding(up_key, modifiers));
+    screen->addAction(&up_action);
   }
   else
   {
@@ -1787,6 +1818,18 @@
   launcher_controller_->KeyNavTerminate(accept_state);
 
   EnableCancelAction(CancelActionTarget::LAUNCHER_SWITCHER, false);
+
+  KeyCode down_key = XKeysymToKeycode(screen->dpy(), XStringToKeysym("Down"));
+  KeyCode up_key = XKeysymToKeycode(screen->dpy(), XStringToKeysym("Up"));
+
+  CompAction down_action;
+  down_action.setKey(CompAction::KeyBinding(down_key, action->key().modifiers()));
+  screen->removeAction(&down_action);
+
+  CompAction up_action;
+  up_action.setKey(CompAction::KeyBinding(up_key, action->key().modifiers()));
+  screen->removeAction(&up_action);
+
   action->setState (action->state() & (unsigned)~(CompAction::StateTermKey));
   return true;
 }

=== modified file 'tests/autopilot/autopilot/emulators/unity/launcher.py'
--- tests/autopilot/autopilot/emulators/unity/launcher.py	2012-03-08 03:51:28 +0000
+++ tests/autopilot/autopilot/emulators/unity/launcher.py	2012-03-10 00:19:22 +0000
@@ -47,6 +47,7 @@
         self.show_timeout = 1
         self.hide_timeout = 1
         self.in_keynav_mode = False
+        self.in_switcher_mode = False
 
         self._mouse = Mouse()
         self._screen = ScreenGeometry()
@@ -95,65 +96,104 @@
         self.keybinding_release("launcher/reveal")
         sleep(1)
 
-    def grab_switcher(self):
+    def key_nav_start(self):
         """Start keyboard navigation mode by pressing Alt+F1."""
         self._screen.move_mouse_to_monitor(self.monitor)
         logger.debug("Initiating launcher keyboard navigation with Alt+F1.")
         self.keybinding("launcher/keynav")
         self.in_keynav_mode = True
 
-    def switcher_enter_quicklist(self):
+    def key_nav_end(self, cancel):
+        """End the key navigation.
+
+        If cancel is True, the currently selected icon will not be activated.
+
+        """
+        if not self.in_keynav_mode:
+            raise RuntimeError("Cannot end the key navigation when not in kaynav mode.")
+        if cancel:
+            logger.debug("Cancelling keyboard navigation mode.")
+            self.keybinding("launcher/keynav/exit")
+        else:
+            logger.debug("Ending keyboard navigation mode, activating icon.")
+            self.keybinding("launcher/keynav/activate")
+
+        self.in_keynav_mode = False
+
+    def key_nav_next(self):
+        if not self.in_keynav_mode:
+            raise RuntimeError("Cannot use the key navigation commands when not in kaynav mode.")
+        logger.debug("Selecting next item in keyboard navigation mode.")
+        self.keybinding("launcher/keynav/next")
+
+    def key_nav_prev(self):
+        if not self.in_keynav_mode:
+          raise RuntimeError("Cannot use the key navigation commands when not in kaynav mode.")
+        logger.debug("Selecting previous item in keyboard navigation mode.")
+        self.keybinding("launcher/keynav/prev")
+
+    def key_nav_enter_quicklist(self):
         if not self.in_keynav_mode:
             raise RuntimeError("Cannot open switcher quicklist while not in keynav mode.")
         logger.debug("Opening quicklist for currently selected icon.")
         self.keybinding("launcher/keynav/open-quicklist")
 
-    def switcher_exit_quicklist(self):
+    def key_nav_exit_quicklist(self):
         if not self.in_keynav_mode:
             raise RuntimeError("Cannot close switcher quicklist while not in keynav mode.")
         logger.debug("Closing quicklist for currently selected icon.")
         self.keybinding("launcher/keynav/close-quicklist")
 
-    def start_switcher(self):
+    def switcher_start(self):
         """Start the super+Tab switcher on this launcher."""
         self._screen.move_mouse_to_monitor(self.monitor)
         logger.debug("Starting Super+Tab switcher.")
         self.keybinding_hold("launcher/switcher")
         self.keybinding_tap("launcher/switcher")
-        sleep(1)
+        self.in_switcher_mode = True
 
-    def end_switcher(self, cancel):
-        """End either the keynav mode or the super+tab swithcer.
+    def switcher_end(self, cancel):
+        """End the super+tab swithcer.
 
         If cancel is True, the currently selected icon will not be activated.
 
         """
+        if not self.in_switcher_mode:
+            raise RuntimeError("Cannot end the launcher switcher when not in switcher mode.")
+            
         if cancel:
             logger.debug("Cancelling keyboard navigation mode.")
-            self.keybinding("launcher/keynav/exit")
-            if not self.in_keynav_mode:
-                self.keybinding_release("launcher/switcher")
+            self.keybinding("launcher/switcher/exit")
+            self.keybinding_release("launcher/switcher")
         else:
             logger.debug("Ending keyboard navigation mode.")
-            if self.in_keynav_mode:
-                self.keybinding("launcher/keynav/activate")
-            else:
-                self.keybinding_release("launcher/switcher")
-        self.in_keynav_mode = False
+            self.keybinding_release("launcher/switcher")
+
+        self.in_switcher_mode = False
 
     def switcher_next(self):
+        if not self.in_switcher_mode:
+            raise RuntimeError("Cannot use the launcher switcher commands when not in switcher mode.")
         logger.debug("Selecting next item in keyboard navigation mode.")
-        if self.in_keynav_mode:
-            self.keybinding("launcher/keynav/next")
-        else:
-            self.keybinding("launcher/switcher/next")
+        self.keybinding("launcher/switcher/next")
 
     def switcher_prev(self):
-        logger.debug("Selecting previous item in keyboard navigation mode.")
-        if self.in_keynav_mode:
-            self.keybinding("launcher/keynav/prev")
-        else:
-            self.keybinding("launcher/switcher/prev")
+        if not self.in_switcher_mode:
+            raise RuntimeError("Cannot use the launcher switcher commands when not in switcher mode.")
+        logger.debug("Selecting previous item in keyboard navigation mode.")
+        self.keybinding("launcher/switcher/prev")
+
+    def switcher_up(self):
+        if not self.in_switcher_mode:
+            raise RuntimeError("Cannot use the launcher switcher commands when not in switcher mode.")
+        logger.debug("Selecting next item in keyboard navigation mode.")
+        self.keybinding("launcher/switcher/up")
+
+    def switcher_down(self):
+        if not self.in_switcher_mode:
+            raise RuntimeError("Cannot use the launcher switcher commands when not in switcher mode.")
+        logger.debug("Selecting previous item in keyboard navigation mode.")
+        self.keybinding("launcher/switcher/down")
 
     def click_launcher_icon(self, icon, button=1):
         """Move the mouse over the launcher icon, and click it.

=== modified file 'tests/autopilot/autopilot/keybindings.py'
--- tests/autopilot/autopilot/keybindings.py	2012-03-10 00:19:22 +0000
+++ tests/autopilot/autopilot/keybindings.py	2012-03-10 00:19:22 +0000
@@ -48,11 +48,14 @@
     "launcher/keynav/prev": "Up",
     "launcher/keynav/activate": "Enter",
     "launcher/keynav/exit": "Escape",
+    "launcher/keynav/open-quicklist": "Right",
+    "launcher/keynav/close-quicklist": "Left",
     "launcher/switcher": ('unityshell', 'launcher_switcher_forward'),
+    "launcher/switcher/exit": "Escape",
     "launcher/switcher/next": "Tab",
     "launcher/switcher/prev": "Shift+Tab",
-    "launcher/keynav/open-quicklist": "Right",
-    "launcher/keynav/close-quicklist": "Left",
+    "launcher/switcher/down": "Down",
+    "launcher/switcher/up": "Up",
     # Dash:
     "dash/reveal": "Super",
     # Lenses

=== modified file 'tests/autopilot/autopilot/tests/test_launcher.py'
--- tests/autopilot/autopilot/tests/test_launcher.py	2012-03-10 00:19:22 +0000
+++ tests/autopilot/autopilot/tests/test_launcher.py	2012-03-10 00:19:22 +0000
@@ -8,7 +8,7 @@
 # by the Free Software Foundation.
 
 import logging
-from testtools.matchers import Equals, LessThan, GreaterThan
+from testtools.matchers import Equals, NotEquals, LessThan, GreaterThan
 from time import sleep
 
 from autopilot.tests import AutopilotTestCase
@@ -51,8 +51,8 @@
         """Test that starting the Launcher switcher puts the keyboard focus on item 0."""
         sleep(.5)
         launcher_instance = self.get_launcher()
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.5)
 
         self.assertThat(self.launcher.key_nav_is_active, Equals(True))
@@ -63,9 +63,9 @@
         """Test that ending the launcher switcher actually works."""
         sleep(.5)
         launcher_instance = self.get_launcher()
-        launcher_instance.start_switcher()
+        launcher_instance.switcher_start()
         sleep(.5)
-        launcher_instance.end_switcher(cancel=True)
+        launcher_instance.switcher_end(cancel=True)
         sleep(.5)
         self.assertThat(self.launcher.key_nav_is_active, Equals(False))
 
@@ -73,21 +73,21 @@
         """Test that ending the launcher switcher actually works."""
         sleep(.5)
         launcher_instance = self.get_launcher()
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.25)
-        self.assertThat(self.launcher.key_nav_is_active(), Equals(True))
+        self.assertThat(self.launcher.key_nav_is_active, Equals(True))
         sleep(.25)
         self.keyboard.press_and_release("Escape")
         sleep(.25)
-        self.assertThat(self.launcher.key_nav_is_active(), Equals(False))
+        self.assertThat(self.launcher.key_nav_is_active, Equals(False))
 
     def test_launcher_switcher_next_works(self):
         """Moving to the next launcher item while switcher is activated must work."""
         sleep(.5)
         launcher_instance = self.get_launcher()
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.5)
 
         launcher_instance.switcher_next()
@@ -98,21 +98,47 @@
         """Moving to the previous launcher item while switcher is activated must work."""
         sleep(.5)
         launcher_instance = self.get_launcher()
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
-        sleep(.5)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
+        sleep(.25)
+        self.assertThat(self.launcher.key_nav_selection, Equals(0))
 
-        launcher_instance.switcher_next()
-        sleep(.5)
         launcher_instance.switcher_prev()
-        self.assertThat(self.launcher.key_nav_selection, Equals(0))
+        sleep(.25)
+        self.assertThat(self.launcher.key_nav_selection, NotEquals(0))
+
+    def test_launcher_switcher_down_works(self):
+        """Pressing the down arrow key while switcher is activated must work."""
+        sleep(.5)
+        launcher_instance = self.get_launcher()
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
+        sleep(.25)
+        self.assertThat(self.launcher.key_nav_selection, Equals(0))
+
+        launcher_instance.switcher_down()
+        sleep(.25)
+        self.assertThat(self.launcher.key_nav_selection, Equals(1))
+
+    def test_launcher_switcher_up_works(self):
+        """Pressing the up arrow key while switcher is activated must work."""
+        sleep(.5)
+        launcher_instance = self.get_launcher()
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
+        sleep(.25)
+        self.assertThat(self.launcher.key_nav_selection, Equals(0))
+
+        launcher_instance.switcher_up()
+        sleep(.25)
+        self.assertThat(self.launcher.key_nav_selection, NotEquals(0))
 
     def test_launcher_switcher_next_doesnt_show_shortcuts(self):
         """Moving forward in launcher switcher must not show launcher shortcuts."""
         sleep(.5)
         launcher_instance = self.get_launcher()
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.5)
         launcher_instance.switcher_next()
         sleep(2)
@@ -122,8 +148,8 @@
         """Moving backward in launcher switcher must not show launcher shortcuts."""
         sleep(.5)
         launcher_instance = self.get_launcher()
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.5)
         launcher_instance.switcher_next()
         sleep(2)
@@ -136,8 +162,8 @@
         """Launcher Switcher must loop through icons when cycling forwards"""
         sleep(.5)
         launcher_instance = self.get_launcher()
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.5)
 
         prev_icon = 0
@@ -160,8 +186,8 @@
         """Launcher Switcher must loop through icons when cycling backwards"""
         sleep(.5)
         launcher_instance = self.get_launcher()
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.5)
 
         launcher_instance.switcher_prev()
@@ -195,8 +221,8 @@
         self.addCleanup(launcher_instance.keyboard_unreveal_launcher)
         sleep(1)
 
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.5)
 
         self.assertThat(self.launcher.key_nav_is_active, Equals(True))
@@ -211,8 +237,8 @@
         self.addCleanup(launcher_instance.keyboard_unreveal_launcher)
         sleep(1)
 
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.5)
 
         launcher_instance.switcher_next()
@@ -223,7 +249,7 @@
         sleep(.5)
         self.assertThat(launcher_instance.are_shortcuts_showing(), Equals(True))
 
-    def test_launcher_switcher_ungrabbed_using_shorcuts(self):
+    def test_launcher_switcher_using_shorcuts(self):
         """Using some other shortcut while switcher is active must cancel switcher."""
         sleep(.5)
 
@@ -232,8 +258,8 @@
         launcher_instance.keyboard_reveal_launcher()
         self.addCleanup(launcher_instance.keyboard_unreveal_launcher)
         sleep(1)
-        launcher_instance.start_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.switcher_start()
+        self.addCleanup(launcher_instance.switcher_end, True)
         sleep(.5)
 
         self.keyboard.press_and_release("s")
@@ -247,8 +273,8 @@
         """Tests we can initiate keyboard navigation on the launcher."""
         launcher_instance = self.get_launcher()
         sleep(.5)
-        launcher_instance.grab_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.key_nav_start()
+        self.addCleanup(launcher_instance.key_nav_end, True)
         sleep(.5)
 
         self.assertThat(self.launcher.key_nav_is_active, Equals(True))
@@ -258,9 +284,9 @@
         """Test that we can exit keynav mode."""
         launcher_instance = self.get_launcher()
         sleep(.5)
-        launcher_instance.grab_switcher()
+        launcher_instance.key_nav_start()
         sleep(.5)
-        launcher_instance.end_switcher(cancel=True)
+        launcher_instance.key_nav_end(cancel=True)
         self.assertThat(self.launcher.key_nav_is_active, Equals(False))
         self.assertThat(self.launcher.key_nav_is_grabbed, Equals(False))
 
@@ -268,8 +294,8 @@
         """Test keynav mode starts at index 0."""
         launcher_instance = self.get_launcher()
         sleep(.5)
-        launcher_instance.grab_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.key_nav_start()
+        self.addCleanup(launcher_instance.key_nav_end, True)
         sleep(.5)
 
         self.assertThat(self.launcher.key_nav_selection, Equals(0))
@@ -278,10 +304,10 @@
         """Must be able to move forwards while in keynav mode."""
         launcher_instance = self.get_launcher()
         sleep(.5)
-        launcher_instance.grab_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.key_nav_start()
+        self.addCleanup(launcher_instance.key_nav_end, True)
         sleep(.5)
-        launcher_instance.switcher_next()
+        launcher_instance.key_nav_next()
         sleep(.5)
         self.assertThat(self.launcher.key_nav_selection, Equals(1))
 
@@ -289,12 +315,12 @@
         """Must be able to move backwards while in keynav mode."""
         launcher_instance = self.get_launcher()
         sleep(.5)
-        launcher_instance.grab_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
-        sleep(.5)
-        launcher_instance.switcher_next()
-        sleep(.5)
-        launcher_instance.switcher_prev()
+        launcher_instance.key_nav_start()
+        self.addCleanup(launcher_instance.key_nav_end, True)
+        sleep(.5)
+        launcher_instance.key_nav_next()
+        sleep(.5)
+        launcher_instance.key_nav_prev()
         sleep(.5)
         self.assertThat(self.launcher.key_nav_selection, Equals(0))
 
@@ -302,13 +328,13 @@
         """Launcher keynav must loop through icons when cycling forwards"""
         launcher_instance = self.get_launcher()
         sleep(.5)
-        launcher_instance.grab_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.key_nav_start()
+        self.addCleanup(launcher_instance.key_nav_end, True)
         sleep(.25)
 
         prev_icon = 0
         for icon in range(1, self.launcher.model.num_launcher_icons()):
-            launcher_instance.switcher_next()
+            launcher_instance.key_nav_next()
             sleep(.25)
             # FIXME We can't directly check for selection/icon number equalty
             # since the launcher model also contains "hidden" icons that aren't
@@ -317,18 +343,18 @@
             prev_icon = self.launcher.key_nav_selection
 
         sleep(.5)
-        launcher_instance.switcher_next()
+        launcher_instance.key_nav_next()
         self.assertThat(self.launcher.key_nav_selection, Equals(0))
 
     def test_launcher_keynav_cycling_backward(self):
         """Launcher keynav must loop through icons when cycling backwards"""
         launcher_instance = self.get_launcher()
         sleep(.5)
-        launcher_instance.grab_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
+        launcher_instance.key_nav_start()
+        self.addCleanup(launcher_instance.key_nav_end, True)
         sleep(.25)
 
-        launcher_instance.switcher_prev()
+        launcher_instance.key_nav_prev()
         # FIXME We can't directly check for self.launcher.num_launcher_icons - 1
         self.assertThat(self.launcher.key_nav_selection, GreaterThan(1))
 
@@ -337,13 +363,13 @@
         launcher_instance = self.get_launcher()
         launcher_instance.move_mouse_to_right_of_launcher()
         sleep(.5)
-        launcher_instance.grab_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
-        sleep(.5)
-        launcher_instance.switcher_next()
-        sleep(.5)
-        launcher_instance.switcher_enter_quicklist()
-        self.addCleanup(launcher_instance.switcher_exit_quicklist)
+        launcher_instance.key_nav_start()
+        self.addCleanup(launcher_instance.key_nav_end, True)
+        sleep(.5)
+        launcher_instance.key_nav_next()
+        sleep(.5)
+        launcher_instance.key_nav_enter_quicklist()
+        self.addCleanup(launcher_instance.key_nav_exit_quicklist)
         sleep(.5)
         self.assertThat(launcher_instance.is_quicklist_open(), Equals(True))
 
@@ -352,14 +378,14 @@
         launcher_instance = self.get_launcher()
         launcher_instance.move_mouse_to_right_of_launcher()
         sleep(.5)
-        launcher_instance.grab_switcher()
-        self.addCleanup(launcher_instance.end_switcher, True)
-        sleep(.5)
-        launcher_instance.switcher_next()
-        sleep(.5)
-        launcher_instance.switcher_enter_quicklist()
-        sleep(.5)
-        launcher_instance.switcher_exit_quicklist()
+        launcher_instance.key_nav_start()
+        self.addCleanup(launcher_instance.key_nav_end, True)
+        sleep(.5)
+        launcher_instance.key_nav_next()
+        sleep(.5)
+        launcher_instance.key_nav_enter_quicklist()
+        sleep(.5)
+        launcher_instance.key_nav_exit_quicklist()
 
         self.assertThat(launcher_instance.is_quicklist_open(), Equals(False))
         self.assertThat(self.launcher.key_nav_is_active, Equals(True))