summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuang Zhu <guangzhu@google.com>2013-06-17 17:41:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-17 17:41:37 -0700
commit9ca3d12833e9e2ae953eec3580d256f7ce5026e3 (patch)
tree1829bd2a124df7fdda932bb26923abb6f2a549bf
parente0ba32238cf52b76f04bd99fe0c8ae7aeafb6c7e (diff)
parent78e503499d4e4a9af449ab68e22f366b16139a0b (diff)
downloadtesting-9ca3d12833e9e2ae953eec3580d256f7ce5026e3.tar.gz
am 78e50349: am 9ebf91aa: fix build
* commit '78e503499d4e4a9af449ab68e22f366b16139a0b': fix build
-rw-r--r--uiautomator/library/core-src/com/android/uiautomator/core/Configurator.java2
-rw-r--r--uiautomator/library/core-src/com/android/uiautomator/core/UiDevice.java2
-rw-r--r--uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java6
-rw-r--r--uiautomator/library/core-src/com/android/uiautomator/core/UiScrollable.java2
-rw-r--r--uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java2
5 files changed, 7 insertions, 7 deletions
diff --git a/uiautomator/library/core-src/com/android/uiautomator/core/Configurator.java b/uiautomator/library/core-src/com/android/uiautomator/core/Configurator.java
index 5f62fc3..249f404 100644
--- a/uiautomator/library/core-src/com/android/uiautomator/core/Configurator.java
+++ b/uiautomator/library/core-src/com/android/uiautomator/core/Configurator.java
@@ -221,4 +221,4 @@ public final class Configurator {
public long getKeyInjectionDelay() {
return mKeyInjectionDelay;
}
-
+}
diff --git a/uiautomator/library/core-src/com/android/uiautomator/core/UiDevice.java b/uiautomator/library/core-src/com/android/uiautomator/core/UiDevice.java
index 9b69d62..a930eb4 100644
--- a/uiautomator/library/core-src/com/android/uiautomator/core/UiDevice.java
+++ b/uiautomator/library/core-src/com/android/uiautomator/core/UiDevice.java
@@ -848,4 +848,4 @@ public class UiDevice {
Tracer.trace(storePath, scale, quality);
return getAutomatorBridge().takeScreenshot(storePath, quality);
}
-
+}
diff --git a/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java b/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java
index d9ba745..4bb99cd 100644
--- a/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java
+++ b/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java
@@ -1070,8 +1070,8 @@ public class UiObject {
* p.pressure = 1;
* p.size = 1;
* </code>
- * @param touches represents the pointers' paths. Each {@link PointerCoords}
- * array represents a different pointer. Each {@link PointerCoords} in an
+ * @param touches represents the pointers' paths. Each {@link PointerCoords}
+ * array represents a different pointer. Each {@link PointerCoords} in an
* array element represents a touch point on a pointer's path.
* @return <code>true</code> if all touch events for this gesture are injected successfully,
* <code>false</code> otherwise
@@ -1080,4 +1080,4 @@ public class UiObject {
public boolean performMultiPointerGesture(PointerCoords[] ...touches) {
return getInteractionController().performMultiPointerGesture(touches);
}
-
+}
diff --git a/uiautomator/library/core-src/com/android/uiautomator/core/UiScrollable.java b/uiautomator/library/core-src/com/android/uiautomator/core/UiScrollable.java
index 9b14c10..a8d20c3 100644
--- a/uiautomator/library/core-src/com/android/uiautomator/core/UiScrollable.java
+++ b/uiautomator/library/core-src/com/android/uiautomator/core/UiScrollable.java
@@ -662,4 +662,4 @@ public class UiScrollable extends UiCollection {
mSwipeDeadZonePercentage = swipeDeadZonePercentage;
return this;
}
-
+}
diff --git a/uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java b/uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java
index a3b5c54..bd61bfd 100644
--- a/uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java
+++ b/uiautomator/library/core-src/com/android/uiautomator/core/UiSelector.java
@@ -1019,4 +1019,4 @@ public class UiSelector {
builder.append("]");
return builder.toString();
}
-
+}