Merge lp:~haggai-eran/unity-2d/rtl-keyboard-navigation-886686 into lp:unity-2d

[Haggai Eran]

Fix right-to-left keyboard navigation in the dash and in the launcher (LP: #886686)

This is an attempt to solve bug #886686. When using a right-to-left locale, and the user interface is mirrored, the left and right key often need to change their meaning, so that the left key moves the cursor to the next logical position, and the right key moves the cursor back to the previous logical position.

This MR makes these changes in the launcher (when opening item's menus), and in the dash.

@Gerry, in a previous comment you mentioned you had reservations about this fix, and perhaps it was possible to make the required changes in unity-panel-service. If I'm not mistaken, unity-panel-service is responsible for displaying the panel menus for applications and indicators, isn't it? The keyboard navigation through the panel menus will also need to be changed, but this MR is targeted at keyboard navigation in the dash and launcher.

[Albert Astals Cid (aacid)]

The code works fine. I am interested in the QML code you used the switchLeftRightKeys way but in focuspath.cpp instead of applying the same principle you decided to change the flow. I think it'd would be easier to understand if you used the switchLeftRightKeys same construct here too.

[Haggai Eran (haggai-eran)]

When I wrote the code in focuspath.cpp I noticed that the flow feature already implemented some kind of mirroring, so I thought it would be nice to use it. You are probably right and switching the keys would probably make the code more robust to future changes. I'll upload an updated version soon.

[lp:~haggai-eran/unity-2d/rtl-keyboard-navigation-886686]

949. By Haggai Eran on 2012-03-07

In RTL, switch the left and right keys in focuspath.cpp, instead of switching the flow.

[Haggai Eran (haggai-eran)]

I've changed the C++ code to switch the left and right keys, similarly to the QML code.

[Albert Astals Cid (aacid)]

Could you move the C++ code that does the left/right switching to a Utils.cpp/Utils.h file and then use that function also in LauncherContextualMenu::keyPressEvent ?

[lp:~haggai-eran/unity-2d/rtl-keyboard-navigation-886686]

950. By Haggai Eran on 2012-03-08

Create a common switchLeftRightKeys() function, and use it in focuspath.cpp and launchermenu.cpp.

[Haggai Eran (haggai-eran)]

Sure, how about this? I moved the switching code to another function.

[Albert Astals Cid (aacid)]

You have a conflict in CMakeLists.txt, can you merge the latest lp:unity-2d into your branch?

Also i'd prefer if you added a namespace to the utils.h i.e.

namespace Unity2dUtils {

/* If using a right-to-left locale, switch the left and right keys. */
int switchLeftRightKeys(int key);

}

review: Needs Fixing

[lp:~haggai-eran/unity-2d/rtl-keyboard-navigation-886686]

951. By Haggai Eran on 2012-03-08

Merge trunk in order to resolve conflicts in libunity-2d-private/src/CMakeLists.txt.

952. By Haggai Eran on 2012-03-08

Move switchLeftRightKeys function to a namespace.

[Haggai Eran (haggai-eran)]

Thanks for pointing out the conflict. I merged the latest trunk, and moved the new function to a namespace as you requested.

[Gerry Boland (gerboland)]

Hey Haggai,
this is nice to automatically test, so I'm writing a test for this now, which I'll write and make a merge request into this branch shortly.
Thanks for your patience
-Gerry

[Haggai Eran (haggai-eran)]

Sure, thank you for writing the test.

[lp:~haggai-eran/unity-2d/rtl-keyboard-navigation-886686]

953. By Haggai Eran on 2012-03-12

[tests] Merge Gerry's launcher menu tests.

[Albert Astals Cid (aacid)]

Looks great :-)

review: Approve

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2012-03-06 18:06:03 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-03-12 18:36:25 +0000
@@ -80,6 +80,7 @@
     inputshaperectangle.cpp
     inputshapemask.cpp
     strutmanager.cpp
+    utils.cpp
     pointerbarrier.cpp
     pointerbarriermanager.cpp
     decayedvalue.cpp

=== modified file 'libunity-2d-private/src/focuspath.cpp'
--- libunity-2d-private/src/focuspath.cpp	2011-12-21 18:14:22 +0000
+++ libunity-2d-private/src/focuspath.cpp	2012-03-12 18:36:25 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "focuspath.h"
+#include "utils.h"
 
 #include <QtCore/qmath.h>
 #include <QEvent>
@@ -345,7 +346,7 @@
                 int nextFocus = m_currentPosition;
 
                 QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
-                switch(keyEvent->key()) {
+                switch(Unity2dUtils::switchLeftRightKeys(keyEvent->key())) {
                     case Qt::Key_Right:
                         if ((m_direction & FocusPath::Horizontal) == FocusPath::Horizontal) {
                             switch(m_flow) {

=== modified file 'libunity-2d-private/src/launchermenu.cpp'
--- libunity-2d-private/src/launchermenu.cpp	2011-12-05 06:49:40 +0000
+++ libunity-2d-private/src/launchermenu.cpp	2012-03-12 18:36:25 +0000
@@ -19,6 +19,7 @@
 
 #include "launchermenu.h"
 #include "launcheritem.h"
+#include "utils.h"
 
 #include <QAction>
 #include <QFile>
@@ -330,7 +331,7 @@
 void
 LauncherContextualMenu::keyPressEvent(QKeyEvent* event)
 {
-    int key = event->key();
+    int key = Unity2dUtils::switchLeftRightKeys(event->key());
     if (key == Qt::Key_Left || key == Qt::Key_Escape) {
         Q_EMIT dismissedByKeyEvent();
         hide();

=== added file 'libunity-2d-private/src/utils.cpp'
--- libunity-2d-private/src/utils.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/utils.cpp	2012-03-12 18:36:25 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Haggai Eran <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils.h"
+
+#include <QApplication>
+
+namespace Unity2dUtils {
+
+/* If using a right-to-left locale, switch the left and right keys. */
+int switchLeftRightKeys(int key)
+{
+    if (QApplication::isRightToLeft()) {
+        switch(key) {
+            case Qt::Key_Right:
+                return Qt::Key_Left;
+            case Qt::Key_Left:
+                return Qt::Key_Right;
+            default:
+                return key;
+        }
+    }
+    return key;
+}
+
+} // namespace
+

=== added file 'libunity-2d-private/src/utils.h'
--- libunity-2d-private/src/utils.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/utils.h	2012-03-12 18:36:25 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Haggai Eran <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UTILS_H
+#define UTILS_H
+
+namespace Unity2dUtils {
+
+/* If using a right-to-left locale, switch the left and right keys. */
+int switchLeftRightKeys(int key);
+
+} // namespace
+    
+#endif // UTILS_H

=== modified file 'shell/common/utils.js'
--- shell/common/utils.js	2012-02-17 15:17:41 +0000
+++ shell/common/utils.js	2012-03-12 18:36:25 +0000
@@ -44,3 +44,17 @@
 function isRightToLeft() {
     return Qt.application.layoutDirection == Qt.RightToLeft
 }
+
+function switchLeftRightKeys(key) {
+    if (isRightToLeft()) {
+        switch (key) {
+        case Qt.Key_Right:
+            return Qt.Key_Left
+        case Qt.Key_Left:
+            return Qt.Key_Right
+        default:
+            return key
+        }
+    }
+    return key
+}

=== modified file 'shell/dash/LensBar.qml'
--- shell/dash/LensBar.qml	2012-03-06 13:05:19 +0000
+++ shell/dash/LensBar.qml	2012-03-12 18:36:25 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 1.0
 import Unity2d 1.0
+import "../common/utils.js" as Utils
 
 FocusScope {
     id: lensBar
@@ -71,7 +72,7 @@
         }
 
         function handleKeyPress(key) {
-            switch (key) {
+            switch (Utils.switchLeftRightKeys(key)) {
             case Qt.Key_Right:
                 return selectChild(currentIndex+1)
             case Qt.Key_Left:

=== modified file 'shell/dash/RatingStars.qml'
--- shell/dash/RatingStars.qml	2012-03-03 17:59:53 +0000
+++ shell/dash/RatingStars.qml	2012-03-12 18:36:25 +0000
@@ -47,7 +47,7 @@
 
     Keys.onPressed: if (handleKeyPress(event.key)) event.accepted = true
     function handleKeyPress(key) {
-        switch (key) {
+        switch (Utils.switchLeftRightKeys(key)) {
         case Qt.Key_Right:
             incrementRating()
             return true

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-02-24 12:48:13 +0000
+++ shell/launcher/LauncherList.qml	2012-03-12 18:36:25 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 1.0
 import Unity2d 1.0 /* required for drag’n’drop handling */
+import "../common/utils.js" as Utils
 
 AutoScrollingListView {
     id: list
@@ -198,13 +199,14 @@
         }
 
         Keys.onPressed: {
-            if (event.key == Qt.Key_Return || event.key == Qt.Key_Enter || event.key == Qt.Key_Space) {
+            var key = Utils.switchLeftRightKeys(event.key)
+            if (key == Qt.Key_Return || key == Qt.Key_Enter || key == Qt.Key_Space) {
                 item.menu.hide()
                 item.activate()
                 event.accepted = true
             }
-            else if ((event.key == Qt.Key_Right && list.showMenus) ||
-                    (event.key == Qt.Key_F10 && (event.modifiers & Qt.ShiftModifier))) {
+            else if ((key == Qt.Key_Right && list.showMenus) ||
+                    (key == Qt.Key_F10 && (event.modifiers & Qt.ShiftModifier))) {
                 /* Show the menu first, then unfold it. Doing things in this
                    order is required because at the moment the code path that
                    adjusts the position of the menu in case it goes offscreen
@@ -215,7 +217,7 @@
                 item.menu.setFocus()
                 event.accepted = true
             }
-            else if (event.key == Qt.Key_Left) {
+            else if (key == Qt.Key_Left) {
                 item.menu.hide()
                 event.accepted = true
             }

=== modified file 'tests/launcher/menu_tests.rb'
--- tests/launcher/menu_tests.rb	2012-03-06 10:36:41 +0000
+++ tests/launcher/menu_tests.rb	2012-03-12 18:36:25 +0000
@@ -27,9 +27,19 @@
 require 'xdo/keyboard'
 require 'xdo/mouse'
 require 'tmpwindow'
+require $library_path + '/../../launcher/menu_tests_common.rb'
 
 ############################# Test Suite #############################
 context "Launcher Contextual Menu Tests" do
+
+  def keyboard_tap_right()
+    XDo::Keyboard.right
+  end
+
+  def keyboard_tap_left()
+    XDo::Keyboard.left
+  end
+
   # Run once at the beginning of this test suite
   startup do
     $SUT.execute_shell_command 'killall unity-2d-shell'
@@ -66,209 +76,35 @@
 
   #####################################################################################
   # Test cases
-
-  # Test case objectives:
-  #   * Check that the hint is displayed on mouse hover
-  # Pre-conditions
-  #   * Desktop with no running applications
-  # Test steps
-  #   * Hover the cursor over the first application entry
-  #   * Check that the hint is displayed
-  #   * Check that there are two QActions (there is a "ghost" QAction there)
-  # Post-conditions
-  #   * None
-  # References
-  #   * None
   test "Display launcher item hint" do
-    tiles = ""
-    verify( TIMEOUT, 'Could not find any application tile' ) {
-      tiles = @app.LauncherList( :name => 'main' ).children( { :desktopFile => /^.*.desktop$/ } )
-    }
-    tile = tiles[0]
-    tile.move_mouse()
-    verify(TIMEOUT, 'The launcher item hint is not visible' ) {
-      @app.LauncherContextualMenu()
-    }
-    actions = ""
-    verify( TIMEOUT, 'Could not find any actions in the menu' ) {
-      actions = @app.LauncherContextualMenu().children( { :type => "QAction" } )
-    }
-    verify_equal( 2, TIMEOUT, 'There was an unexpected number of actions in the menu' ) {
-      actions.count
-    }
+    test_display_launcher_item_hint()
   end
 
-  # Test case objectives:
-  #   * Check that the menu is displayed on right click
-  # Pre-conditions
-  #   * Desktop with no running applications
-  # Test steps
-  #   * Right click the first application entry
-  #   * Check that the menu is displayed
-  #   * Check that there are at least four QActions (two actions and separator, plus a "ghost" one)
-  # Post-conditions
-  #   * None
-  # References
-  #   * None
   test "Display launcher menu after right click" do
-    tiles = ""
-    verify( TIMEOUT, 'Could not find any application tile' ) {
-      tiles = @app.LauncherList( :name => 'main' ).children( { :desktopFile => /^.*.desktop$/ } )
-    }
-    tile = tiles[0]
-    tile.move_mouse()
-    tile.tap(1, :Right)
-    verify(TIMEOUT, 'The launcher menu is not visible' ) {
-      @app.LauncherContextualMenu()
-    }
-    actions = ""
-    verify( TIMEOUT, 'Could not find any actions in the menu' ) {
-      actions = @app.LauncherContextualMenu().children( { :type => "QAction" } )
-    }
-    verify_true( TIMEOUT, 'There was not enough actions in the menu' ) {
-      actions.count >= 4
-    }
+    test_display_launcher_menu_after_right_click()
   end
 
-  # Test case objectives:
-  #   * Check that the menu is displayed on right key from item
-  # Pre-conditions
-  #   * Desktop with no running applications
-  # Test steps
-  #   * Focus the launcher, go down and right
-  #   * Check that the menu is displayed
-  #   * Check that there are at least four QActions (two actions and separator, plus a "ghost" one)
-  # Post-conditions
-  #   * None
-  # References
-  #   * None
   test "Display launcher menu with keyboard navigation" do
-    XDo::Keyboard.alt_F1
-    XDo::Keyboard.down
-    XDo::Keyboard.right
-    verify(TIMEOUT, 'The launcher menu is not visible' ) {
-      @app.LauncherContextualMenu()
-    }
-    actions = ""
-    verify( TIMEOUT, 'Could not find any actions in the menu' ) {
-      actions = @app.LauncherContextualMenu().children( { :type => "QAction" } )
-    }
-    verify_true( TIMEOUT, 'There was not enough actions in the menu' ) {
-      actions.count >= 4
-    }
+    test_display_launcher_menu_with_keyboard_navigation()
   end
 
-  # Test case objectives:
-  #   * Check that the menu is being closed on Esc
-  # Pre-conditions
-  #   * Desktop with no running applications
-  # Test steps
-  #   * Focus the launcher, go down and right, press Esc
-  #   * Check that the menu is no longer there
-  # Post-conditions
-  #   * None
-  # References
-  #   * None
   test "Close launcher menu when pressing Esc" do
-    XDo::Keyboard.alt_F1
-    XDo::Keyboard.down
-    XDo::Keyboard.right
-    XDo::Keyboard.escape
-    verify_not(TIMEOUT, 'The launcher menu is not visible' ) {
-      @app.LauncherContextualMenu()
-    }
+    test_close_launcher_menu_when_pressing_esc()
   end
 
-  # Test case objectives:
-  #   * Check that the menu is being closed on left key
-  # Pre-conditions
-  #   * Desktop with no running applications
-  # Test steps
-  #   * Focus the launcher, go down and right, then left
-  #   * Check that the menu is no longer there
-  # Post-conditions
-  #   * None
-  # References
-  #   * None
   test "Close launcher menu when navigating back to the launcher" do
-    XDo::Keyboard.alt_F1
-    XDo::Keyboard.down
-    XDo::Keyboard.right
-    XDo::Keyboard.left
-    verify_not(TIMEOUT, 'The launcher menu is not visible' ) {
-      @app.LauncherContextualMenu()
-    }
+    test_close_launcher_menu_when_navigating_back_to_the_launcher()
   end
 
-  # Test case objectives:
-  #   * Check that the focus goes back to the launcher item when menu was dismissed with Esc
-  # Pre-conditions
-  #   * Desktop with no running applications
-  # Test steps
-  #   * Focus the launcher, go down and right, press Esc
-  #   * Check that the launcher item has focus
-  # Post-conditions
-  #   * None
-  # References
-  #   * None
   test "Verify launcher tile gets focus after dismissing the menu with Esc" do
-    XDo::Keyboard.alt_F1
-    XDo::Keyboard.down
-    XDo::Keyboard.right
-    XDo::Keyboard.escape
-    tiles = ""
-    verify( TIMEOUT, 'Could not find any application tile' ) {
-      tiles = @app.LauncherList( :name => 'main' ).children( { :desktopFile => /^.*.desktop$/ } )
-    }
-    tile = tiles[0]
-    verify_equal( "true", TIMEOUT, 'Launcher item didn\'t regain focus' ) {
-      tile['activeFocus']
-    }
+    test_verify_launcher_tile_gets_focus_after_dismissing_the_menu_with_esc()
   end
 
-  # Test case objectives:
-  #   * Check that the focus goes back to the launcher item when menu was dismissed with keyboard navigation
-  # Pre-conditions
-  #   * Desktop with no running applications
-  # Test steps
-  #   * Focus the launcher, go down and right, press Esc
-  #   * Check that the launcher item has focus
-  # Post-conditions
-  #   * None
-  # References
-  #   * None
   test "Verify launcher tile gets focus after dismissing the menu with keyboard navigation" do
-    XDo::Keyboard.alt_F1
-    XDo::Keyboard.down
-    XDo::Keyboard.right
-    XDo::Keyboard.left
-    tiles = ""
-    verify( TIMEOUT, 'Could not find any application tile' ) {
-      tiles = @app.LauncherList( :name => 'main' ).children( { :desktopFile => /^.*.desktop$/ } )
-    }
-    tile = tiles[0]
-    verify_equal( "true", TIMEOUT, 'Launcher item didn\'t regain focus' ) {
-      tile['activeFocus']
-    }
+    test_verify_launcher_tile_gets_focus_after_dismissing_the_menu_with_keyboard_navigation()
   end
 
-  # Test case objectives:
-  #   * Check that the focus goes from launcher menu to dash
-  # Pre-conditions
-  #   * Desktop with no running applications
-  # Test steps
-  #   * Focus the launcher, go right, press Super
-  #   * Check that the dash search entry has focus
-  # Post-conditions
-  #   * None
-  # References
-  #   * None
   test "Verify dash search entry gets focus after dismissing the menu with Super" do
-    XDo::Keyboard.alt_F1
-    XDo::Keyboard.right
-    XDo::Keyboard.super
-    verify_equal( "true", TIMEOUT, 'Dash search entry doesn\'t have focus' ) {
-      @app.SearchEntry()['activeFocus']
-    }
+    test_verify_dash_search_entry_gets_focus_after_dismissing_the_menu_with_super()
   end
 end

=== added file 'tests/launcher/menu_tests_common.rb'
--- tests/launcher/menu_tests_common.rb	1970-01-01 00:00:00 +0000
+++ tests/launcher/menu_tests_common.rb	2012-03-12 18:36:25 +0000
@@ -0,0 +1,225 @@
+=begin
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+# Test case objectives:
+#   * Check that the hint is displayed on mouse hover
+# Pre-conditions
+#   * Desktop with no running applications
+# Test steps
+#   * Hover the cursor over the first application entry
+#   * Check that the hint is displayed
+#   * Check that there are two QActions (there is a "ghost" QAction there)
+# Post-conditions
+#   * None
+# References
+#   * None
+def test_display_launcher_item_hint()
+  tiles = ""
+  verify( TIMEOUT, 'Could not find any application tile' ) {
+    tiles = @app.LauncherList( :name => 'main' ).children( { :desktopFile => /^.*.desktop$/ } )
+  }
+  tile = tiles[0]
+  tile.move_mouse()
+  verify(TIMEOUT, 'The launcher item hint is not visible' ) {
+    @app.LauncherContextualMenu()
+  }
+  actions = ""
+  verify( TIMEOUT, 'Could not find any actions in the menu' ) {
+    actions = @app.LauncherContextualMenu().children( { :type => "QAction" } )
+  }
+  verify_equal( 2, TIMEOUT, 'There was an unexpected number of actions in the menu' ) {
+    actions.count
+  }
+end
+
+# Test case objectives:
+#   * Check that the menu is displayed on right click
+# Pre-conditions
+#   * Desktop with no running applications
+# Test steps
+#   * Right click the first application entry
+#   * Check that the menu is displayed
+#   * Check that there are at least four QActions (two actions and separator, plus a "ghost" one)
+# Post-conditions
+#   * None
+# References
+#   * None
+def test_display_launcher_menu_after_right_click()
+  tiles = ""
+  verify( TIMEOUT, 'Could not find any application tile' ) {
+    tiles = @app.LauncherList( :name => 'main' ).children( { :desktopFile => /^.*.desktop$/ } )
+  }
+  tile = tiles[0]
+  tile.move_mouse()
+  tile.tap(1, :Right)
+  verify(TIMEOUT, 'The launcher menu is not visible' ) {
+    @app.LauncherContextualMenu()
+  }
+  actions = ""
+  verify( TIMEOUT, 'Could not find any actions in the menu' ) {
+    actions = @app.LauncherContextualMenu().children( { :type => "QAction" } )
+  }
+  verify_true( TIMEOUT, 'There was not enough actions in the menu' ) {
+    actions.count >= 4
+  }
+end
+
+# Test case objectives:
+#   * Check that the menu is displayed on right key from item
+# Pre-conditions
+#   * Desktop with no running applications
+# Test steps
+#   * Focus the launcher, go down and right
+#   * Check that the menu is displayed
+#   * Check that there are at least four QActions (two actions and separator, plus a "ghost" one)
+# Post-conditions
+#   * None
+# References
+#   * None
+def test_display_launcher_menu_with_keyboard_navigation()
+  XDo::Keyboard.alt_F1
+  XDo::Keyboard.down
+  keyboard_tap_right()
+  verify(TIMEOUT, 'The launcher menu is not visible' ) {
+    @app.LauncherContextualMenu()
+  }
+  actions = ""
+  verify( TIMEOUT, 'Could not find any actions in the menu' ) {
+    actions = @app.LauncherContextualMenu().children( { :type => "QAction" } )
+  }
+  verify_true( TIMEOUT, 'There was not enough actions in the menu' ) {
+    actions.count >= 4
+  }
+end
+
+# Test case objectives:
+#   * Check that the menu is being closed on Esc
+# Pre-conditions
+#   * Desktop with no running applications
+# Test steps
+#   * Focus the launcher, go down and right, press Esc
+#   * Check that the menu is no longer there
+# Post-conditions
+#   * None
+# References
+#   * None
+def test_close_launcher_menu_when_pressing_esc()
+  XDo::Keyboard.alt_F1
+  XDo::Keyboard.down
+  keyboard_tap_right()
+  XDo::Keyboard.escape
+  verify_not(TIMEOUT, 'The launcher menu is not visible' ) {
+    @app.LauncherContextualMenu()
+  }
+end
+
+# Test case objectives:
+#   * Check that the menu is being closed on left key
+# Pre-conditions
+#   * Desktop with no running applications
+# Test steps
+#   * Focus the launcher, go down and right, then left
+#   * Check that the menu is no longer there
+# Post-conditions
+#   * None
+# References
+#   * None
+def test_close_launcher_menu_when_navigating_back_to_the_launcher()
+  XDo::Keyboard.alt_F1
+  XDo::Keyboard.down
+  keyboard_tap_right()
+  keyboard_tap_left()
+  verify_not(TIMEOUT, 'The launcher menu is not visible' ) {
+    @app.LauncherContextualMenu()
+  }
+end
+
+# Test case objectives:
+#   * Check that the focus goes back to the launcher item when menu was dismissed with Esc
+# Pre-conditions
+#   * Desktop with no running applications
+# Test steps
+#   * Focus the launcher, go down and right, press Esc
+#   * Check that the launcher item has focus
+# Post-conditions
+#   * None
+# References
+#   * None
+def test_verify_launcher_tile_gets_focus_after_dismissing_the_menu_with_esc()
+  XDo::Keyboard.alt_F1
+  XDo::Keyboard.down
+  keyboard_tap_right()
+  XDo::Keyboard.escape
+  tiles = ""
+  verify( TIMEOUT, 'Could not find any application tile' ) {
+    tiles = @app.LauncherList( :name => 'main' ).children( { :desktopFile => /^.*.desktop$/ } )
+  }
+  tile = tiles[0]
+  verify_equal( "true", TIMEOUT, 'Launcher item didn\'t regain focus' ) {
+    tile['activeFocus']
+  }
+end
+
+# Test case objectives:
+#   * Check that the focus goes back to the launcher item when menu was dismissed with keyboard navigation
+# Pre-conditions
+#   * Desktop with no running applications
+# Test steps
+#   * Focus the launcher, go down and right, press Esc
+#   * Check that the launcher item has focus
+# Post-conditions
+#   * None
+# References
+#   * None
+def test_verify_launcher_tile_gets_focus_after_dismissing_the_menu_with_keyboard_navigation()
+  XDo::Keyboard.alt_F1
+  XDo::Keyboard.down
+  keyboard_tap_right()
+  keyboard_tap_left()
+  tiles = ""
+  verify( TIMEOUT, 'Could not find any application tile' ) {
+    tiles = @app.LauncherList( :name => 'main' ).children( { :desktopFile => /^.*.desktop$/ } )
+  }
+  tile = tiles[0]
+  verify_equal( "true", TIMEOUT, 'Launcher item didn\'t regain focus' ) {
+    tile['activeFocus']
+  }
+end
+
+# Test case objectives:
+#   * Check that the focus goes from launcher menu to dash
+# Pre-conditions
+#   * Desktop with no running applications
+# Test steps
+#   * Focus the launcher, go right, press Super
+#   * Check that the dash search entry has focus
+# Post-conditions
+#   * None
+# References
+#   * None
+def test_verify_dash_search_entry_gets_focus_after_dismissing_the_menu_with_super()
+  XDo::Keyboard.alt_F1
+  keyboard_tap_right()
+  XDo::Keyboard.super
+  verify_equal( "true", TIMEOUT, 'Dash search entry doesn\'t have focus' ) {
+    @app.SearchEntry()['activeFocus']
+  }
+end
+

=== added file 'tests/launcher/menu_tests_rtl.rb'
--- tests/launcher/menu_tests_rtl.rb	1970-01-01 00:00:00 +0000
+++ tests/launcher/menu_tests_rtl.rb	2012-03-12 18:36:25 +0000
@@ -0,0 +1,110 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Michał Sawicz <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+require '../run-tests.rb' unless $INIT_COMPLETED
+require 'xdo/xwindow'
+require 'xdo/keyboard'
+require 'xdo/mouse'
+require 'tmpwindow'
+require $library_path + '/../../launcher/menu_tests_common.rb'
+
+############################# Test Suite #############################
+context "Launcher Contextual Menu Tests" do
+
+  def keyboard_tap_right()
+    XDo::Keyboard.left
+  end
+
+  def keyboard_tap_left()
+    XDo::Keyboard.right
+  end
+
+  # Run once at the beginning of this test suite
+  startup do
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+
+    # Minimize all windows
+    XDo::XWindow.toggle_minimize_all
+  end
+
+  # Run once at the end of this test suite
+  shutdown do
+  end
+
+  # Run before each test case begins
+  setup do
+    # Ensure mouse out of the way
+    XDo::Mouse.move(200,200,10,true)
+
+    # Execute the application
+    @app = $SUT.run( :name => UNITY_2D_SHELL,
+                     :arguments => "-testability,-reverse",
+                     :sleeptime => 2)
+    # Make certain application is ready for testing
+    verify{ @app.Launcher() }
+  end
+
+  # Run after each test case completes
+  teardown do
+    #@app.close
+    #@app.close
+    #Need to kill Shell as it does not shutdown when politely asked
+    $SUT.execute_shell_command 'pkill -nf unity-2d-shell'
+  end
+
+  #####################################################################################
+  # Test cases
+  test "Display launcher item hint" do
+    test_display_launcher_item_hint()
+  end
+
+  test "Display launcher menu after right click" do
+    test_display_launcher_menu_after_right_click()
+  end
+
+  test "Display launcher menu with keyboard navigation" do
+    test_display_launcher_menu_with_keyboard_navigation()
+  end
+
+  test "Close launcher menu when pressing Esc" do
+    test_close_launcher_menu_when_pressing_esc()
+  end
+
+  test "Close launcher menu when navigating back to the launcher" do
+    test_close_launcher_menu_when_navigating_back_to_the_launcher()
+  end
+
+  test "Verify launcher tile gets focus after dismissing the menu with Esc" do
+    test_verify_launcher_tile_gets_focus_after_dismissing_the_menu_with_esc()
+  end
+
+  test "Verify launcher tile gets focus after dismissing the menu with keyboard navigation" do
+    test_verify_launcher_tile_gets_focus_after_dismissing_the_menu_with_keyboard_navigation()
+  end
+
+  test "Verify dash search entry gets focus after dismissing the menu with Super" do
+    test_verify_dash_search_entry_gets_focus_after_dismissing_the_menu_with_super()
+  end
+end