merge in jb-mr0-release history after reset to jb-dev
diff --git a/uiautomator/library/src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java b/uiautomator/library/src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java
index ab68120..2bea0a0 100644
--- a/uiautomator/library/src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java
+++ b/uiautomator/library/src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java
@@ -30,6 +30,10 @@
import java.io.IOException;
import java.io.StringWriter;
+/**
+ *
+ * @hide
+ */
public class AccessibilityNodeInfoDumper {
private static final String LOGTAG = AccessibilityNodeInfoDumper.class.getSimpleName();
diff --git a/uiautomator/library/src/com/android/uiautomator/core/InteractionController.java b/uiautomator/library/src/com/android/uiautomator/core/InteractionController.java
index ad73fe8..ce14337 100644
--- a/uiautomator/library/src/com/android/uiautomator/core/InteractionController.java
+++ b/uiautomator/library/src/com/android/uiautomator/core/InteractionController.java
@@ -135,9 +135,7 @@
}
public boolean click(int x, int y) {
- if (DEBUG) {
- Log.d(LOG_TAG, "tap (" + x + ", " + y + ")");
- }
+ Log.d(LOG_TAG, "click (" + x + ", " + y + ")");
mUiAutomatorBridge.setOperationTime();
if (touchDown(x, y)) {
@@ -151,7 +149,7 @@
public boolean clickAndWaitForNewWindow(final int x, final int y, long timeout) {
if (DEBUG) {
- Log.d(LOG_TAG, "tap (" + x + ", " + y + ")");
+ Log.d(LOG_TAG, "click (" + x + ", " + y + ")");
}
Runnable command = new Runnable() {
@Override
diff --git a/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java b/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java
index f827bb0..7fbe328 100644
--- a/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java
+++ b/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java
@@ -100,6 +100,7 @@
* The returned display size is adjusted per screen rotation
*
* @return
+ * @hide
*/
public Point getDisplaySizeDp() {
Display display = WindowManagerImpl.getDefault().getDefaultDisplay();
diff --git a/uiautomator/library/src/com/android/uiautomator/core/UiObject.java b/uiautomator/library/src/com/android/uiautomator/core/UiObject.java
index caf3e18..8a8fd76 100644
--- a/uiautomator/library/src/com/android/uiautomator/core/UiObject.java
+++ b/uiautomator/library/src/com/android/uiautomator/core/UiObject.java
@@ -39,9 +39,8 @@
protected static final long WAIT_FOR_WINDOW_TMEOUT = 5500;
protected static final int SWIPE_MARGIN_LIMIT = 5;
- protected UiSelector mSelector;
- protected final UiDevice mDevice;
- protected final UiAutomatorBridge mUiAutomationBridge;
+ private UiSelector mSelector;
+ private final UiAutomatorBridge mUiAutomationBridge;
/**
* Constructs a UiObject to represent a specific UI element matched by the specified
@@ -51,7 +50,6 @@
*/
public UiObject(UiSelector selector) {
mUiAutomationBridge = UiDevice.getInstance().getAutomatorBridge();
- mDevice = UiDevice.getInstance();
mSelector = selector;
}
@@ -71,7 +69,7 @@
*
* @return {@link QueryController}
*/
- protected QueryController getQueryController() {
+ QueryController getQueryController() {
return mUiAutomationBridge.getQueryController();
}
@@ -81,7 +79,7 @@
*
* @return {@link InteractionController}
*/
- protected InteractionController getInteractionController() {
+ InteractionController getInteractionController() {
return mUiAutomationBridge.getInteractionController();
}
diff --git a/uiautomator/library/src/com/android/uiautomator/core/UiScrollable.java b/uiautomator/library/src/com/android/uiautomator/core/UiScrollable.java
index 4fc8afa..3f05921 100644
--- a/uiautomator/library/src/com/android/uiautomator/core/UiScrollable.java
+++ b/uiautomator/library/src/com/android/uiautomator/core/UiScrollable.java
@@ -38,7 +38,7 @@
private static int mMaxSearchSwipes = 30;
// Used in ScrollForward() and ScrollBackward() to determine swipe direction
- protected boolean mIsVerticalList = true;
+ private boolean mIsVerticalList = true;
private double mSwipeDeadZonePercentage = DEFAULT_SWIPE_DEADZONE_PCT;
diff --git a/uiautomator/library/src/com/android/uiautomator/core/UiSelector.java b/uiautomator/library/src/com/android/uiautomator/core/UiSelector.java
index be88804..813b35d 100644
--- a/uiautomator/library/src/com/android/uiautomator/core/UiSelector.java
+++ b/uiautomator/library/src/com/android/uiautomator/core/UiSelector.java
@@ -54,7 +54,6 @@
static final int SELECTOR_COUNT = 23;
private SparseArray<Object> mSelectorAttributes = new SparseArray<Object>();
- public static final String LOG_TAG = UiSelector.class.getSimpleName();
public UiSelector() {
}
diff --git a/uiautomator/library/src/com/android/uiautomator/testrunner/TestCaseCollector.java b/uiautomator/library/src/com/android/uiautomator/testrunner/TestCaseCollector.java
index f8dd622..ae27838 100644
--- a/uiautomator/library/src/com/android/uiautomator/testrunner/TestCaseCollector.java
+++ b/uiautomator/library/src/com/android/uiautomator/testrunner/TestCaseCollector.java
@@ -26,6 +26,7 @@
/**
* A convenient class that encapsulates functions for adding test classes
*
+ * @hide
*/
public class TestCaseCollector {
diff --git a/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java b/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java
index d440a9e..d119693 100644
--- a/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java
+++ b/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java
@@ -116,7 +116,7 @@
SystemClock.sleep(ms);
}
- protected void setDummyIme() throws RemoteException {
+ private void setDummyIme() throws RemoteException {
IInputMethodManager im = IInputMethodManager.Stub.asInterface(ServiceManager
.getService(Context.INPUT_METHOD_SERVICE));
List<InputMethodInfo> infos = im.getInputMethodList();
@@ -133,7 +133,7 @@
im.setInputMethod(null, id);
}
- protected void restoreActiveIme() throws RemoteException {
+ private void restoreActiveIme() throws RemoteException {
// TODO: figure out a way to restore active IME
// Currently retrieving active IME requires querying secure settings provider, which is hard
// to do without a Context; so the caveat here is that to make the post test device usable,
diff --git a/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestCaseFilter.java b/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestCaseFilter.java
index 7f47e9a..1de5a4d 100644
--- a/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestCaseFilter.java
+++ b/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestCaseFilter.java
@@ -23,6 +23,7 @@
/**
* A {@link TestCaseFilter} that accepts testFoo methods and {@link UiAutomatorTestCase} classes
*
+ * @hide
*/
public class UiAutomatorTestCaseFilter implements TestCaseFilter {
diff --git a/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestRunner.java b/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestRunner.java
index ae2d0ac..02553e6 100644
--- a/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestRunner.java
+++ b/uiautomator/library/src/com/android/uiautomator/testrunner/UiAutomatorTestRunner.java
@@ -43,6 +43,9 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * @hide
+ */
public class UiAutomatorTestRunner {
private static final String LOGTAG = UiAutomatorTestRunner.class.getSimpleName();
