Renamed keyevent to press_keycode and added long_press_keycode.

Payman Delshad · Payman Delshad · commit 2d25554608d5 · 2014-05-26T15:48:48.000+02:00
diff --git a/README.md b/README.md
@@ -375,7 +375,7 @@ Android only.
 
 ```python
 # sending 'Home' key event
-driver.keyevent(3)
+driver.press_keycode(3)
 ```
 
 
diff --git a/appium/webdriver/mobilecommand.py b/appium/webdriver/mobilecommand.py
@@ -22,7 +22,8 @@ class MobileCommand(object):
 
     # Appium Commands
     GET_APP_STRINGS = 'getAppStrings'
-    KEY_EVENT = 'keyEvent'
+    PRESS_KEYCODE = 'pressKeyCode'
+    LONG_PRESS_KEYCODE = 'longPressKeyCode'
     GET_CURRENT_ACTIVITY = 'getCurrentActivity'
     SET_IMMEDIATE_VALUE = 'setImmediateValue'
     PULL_FILE = 'pullFile'
diff --git a/appium/webdriver/webdriver.py b/appium/webdriver/webdriver.py
@@ -337,7 +337,7 @@ def hide_keyboard(self, key_name=None):
         self.execute(Command.HIDE_KEYBOARD, data)
         return self
 
-    def keyevent(self, keycode, metastate=None):
+    def press_keycode(self, keycode, metastate=None):
         """Sends a keycode to the device. Android only. Possible keycodes can be
         found in http://developer.android.com/reference/android/view/KeyEvent.html.
 
@@ -353,6 +353,22 @@ def keyevent(self, keycode, metastate=None):
         self.execute(Command.KEY_EVENT, data)
         return self
 
+    def long_press_keycode(self, keycode, metastate=None):
+        """Sends a long press of keycode to the device. Android only. Possible keycodes can be
+        found in http://developer.android.com/reference/android/view/KeyEvent.html.
+
+        :Args:
+         - keycode - the keycode to be sent to the device
+         - metastate - meta information about the keycode being sent
+        """
+        data = {
+            'keycode': keycode
+        }
+        if metastate != None:
+            data['metastate'] = metastate
+        self.execute(Command.LONG_PRESS_KEYCODE, data)
+        return self
+
     @property
     def current_activity(self):
         """Retrieves the current activity on the device.
@@ -519,8 +535,10 @@ def _addCommands(self):
             ('POST', '/session/$sessionId/touch/multi/perform')
         self.command_executor._commands[Command.GET_APP_STRINGS] = \
             ('GET', '/session/$sessionId/appium/app/strings')
-        self.command_executor._commands[Command.KEY_EVENT] = \
-            ('POST', '/session/$sessionId/appium/device/keyevent')
+        self.command_executor._commands[Command.PRESS_KEYCODE] = \
+            ('POST', '/session/$sessionId/appium/device/press_keycode')
+        self.command_executor._commands[Command.LONG_PRESS_KEYCODE] = \
+            ('POST', '/session/$sessionId/appium/device/long_press_keycode')
         self.command_executor._commands[Command.GET_CURRENT_ACTIVITY] = \
             ('GET', '/session/$sessionId/appium/device/current_activity')
         self.command_executor._commands[Command.SET_IMMEDIATE_VALUE] = \
diff --git a/test/functional/android/appium_tests.py b/test/functional/android/appium_tests.py
@@ -37,9 +37,13 @@ def test_app_strings(self):
         strings = self.driver.app_strings
         self.assertEqual(u'You can\'t wipe my data, you are a monkey!', strings[u'monkey_wipe_data'])
 
-    def test_keyevent(self):
+    def test_press_keycode(self):
         # not sure how to test this.
-        self.driver.keyevent(176)
+        self.driver.press_keycode(176)
+
+    def test_long_press_keycode(self):
+        # not sure how to test this.
+        self.driver.long_press_keycode(176)
 
     def test_current_activity(self):
         activity = self.driver.current_activity
