Fix android_action_runner.InputSwipe and InputText

telemetry/telemetry/core/android_action_runner.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import time
 
 from devil.android.sdk import keyevent
 
 import py_utils
@@ skipping 52 matching lines @@
       seconds: The number of seconds to wait.
     """
     time.sleep(seconds)
 
   def InputText(self, string):
     """Convert the characters of the string into key events and send to device.
 
     Args:
       string: The string to send to the device.
     """
-    self._platform_backend.device.RunShellCommand(
-        ['input', 'text', string], check_return=True)
+    # Spaces should be input as keyevents since 'input text <text>' does not
+    # work with space. Pass space character to account for strings with multiple
+    # spaces.
+    words = string.split(' ')
+    for i in range(0, len(words)):
+      if i is not 0:
+        self.InputKeyEvent(keyevent.KEYCODE_SPACE)
+      self._platform_backend.device.RunShellCommand(
+          ['input', 'text', words[i]], check_return=True)
 
   def InputKeyEvent(self, keycode):
     """Send a single key input to the device.
 
     See the devil.android.sdk.keyevent module for suitable keycode values.
 
     Args:
       keycode: A key code number that will be sent to the device.
     """
     self._platform_backend.device.SendKeyEvent(keycode)
@@ skipping 13 matching lines @@
     """Perform a swipe input.
 
     Args:
       left_start_coord: The horizontal starting coordinate of the gesture
       top_start_coord: The vertical starting coordinate of the gesture
       left_end_coord: The horizontal ending coordinate of the gesture
       top_end_coord: The vertical ending coordinate of the gesture
       duration: The length of time of the swipe in milliseconds
     """
     cmd = ['input', 'swipe']
-    cmd.expand(str(x) for x in (left_start_coord, top_start_coord,
+    cmd.extend(str(x) for x in (left_start_coord, top_start_coord,
                                 left_end_coord, top_end_coord, duration))
     self._platform_backend.device.RunShellCommand(cmd, check_return=True)
 
   def InputPress(self):
     """Perform a press input."""
     self._platform_backend.device.RunShellCommand(
         ['input', 'press'], check_return=True)
 
   def InputRoll(self, dx, dy):
     """Perform a roll input. This sends a simple zero-pressure move event.
@@ skipping 40 matching lines @@
     def is_screen_unlocked():
       return not self._platform_backend.IsScreenLocked()
 
     if self._platform_backend.IsScreenLocked():
       self.InputKeyEvent(keyevent.KEYCODE_MENU)
     else:
       logging.warning('Screen not locked when expected.')
       return
 
     py_utils.WaitFor(is_screen_unlocked, 5)