Remove unnecessary @since annotations
* As uiautomator is unbundled from the platform, these annotations are
no longer applicable.
Test: ./gradlew dackkaDocs
Change-Id: I0ec6bb54024134ff7f48d288ad53817214d5598f
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/Configurator.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/Configurator.java
index de67051..0a626d7 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/Configurator.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/Configurator.java
@@ -29,7 +29,6 @@
* the original value of any parameter that you are modifying. After running your
* tests with the modified parameters, make sure to also restore
* the original parameter values, otherwise this will impact other tests cases.
- * @since API Level 18
*/
public final class Configurator {
private long mWaitForIdleTimeout = 10 * 1000;
@@ -61,7 +60,6 @@
* Retrieves a singleton instance of Configurator.
*
* @return Configurator instance
- * @since API Level 18
*/
public static @NonNull Configurator getInstance() {
if (sConfigurator == null) {
@@ -83,7 +81,6 @@
*
* @param timeout Timeout value in milliseconds
* @return self
- * @since API Level 18
*/
public @NonNull Configurator setWaitForIdleTimeout(long timeout) {
mWaitForIdleTimeout = timeout;
@@ -102,7 +99,6 @@
* See {@link #setWaitForSelectorTimeout(long)}
*
* @return Current timeout value in milliseconds
- * @since API Level 18
*/
public long getWaitForIdleTimeout() {
return mWaitForIdleTimeout;
@@ -119,7 +115,6 @@
*
* @param timeout Timeout value in milliseconds.
* @return self
- * @since API Level 18
*/
public @NonNull Configurator setWaitForSelectorTimeout(long timeout) {
mWaitForSelector = timeout;
@@ -136,7 +131,6 @@
* the timeout elapses.
*
* @return Current timeout value in milliseconds
- * @since API Level 18
*/
public long getWaitForSelectorTimeout() {
return mWaitForSelector;
@@ -153,7 +147,6 @@
*
* @param timeout Timeout value in milliseconds
* @return self
- * @since API Level 18
*/
public @NonNull Configurator setScrollAcknowledgmentTimeout(long timeout) {
mScrollEventWaitTimeout = timeout;
@@ -170,7 +163,6 @@
* See {@link UiScrollable}
*
* @return current timeout in milliseconds
- * @since API Level 18
*/
public long getScrollAcknowledgmentTimeout() {
return mScrollEventWaitTimeout;
@@ -187,7 +179,6 @@
*
* @param timeout Timeout value in milliseconds
* @return self
- * @since API Level 18
*/
public @NonNull Configurator setActionAcknowledgmentTimeout(long timeout) {
mWaitForActionAcknowledgment = timeout;
@@ -204,7 +195,6 @@
* See {@link UiObject}
*
* @return current timeout in milliseconds
- * @since API Level 18
*/
public long getActionAcknowledgmentTimeout() {
return mWaitForActionAcknowledgment;
@@ -216,7 +206,6 @@
*
* @param delay Delay value in milliseconds
* @return self
- * @since API Level 18
*/
public @NonNull Configurator setKeyInjectionDelay(long delay) {
mKeyInjectionDelay = delay;
@@ -228,7 +217,6 @@
* See {@link UiObject#setText(String)}
*
* @return current delay in milliseconds
- * @since API Level 18
*/
public long getKeyInjectionDelay() {
return mKeyInjectionDelay;
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/IAutomationSupport.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/IAutomationSupport.java
index 17d6879..e74908f 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/IAutomationSupport.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/IAutomationSupport.java
@@ -22,8 +22,6 @@
/**
* Provides auxiliary support for running test cases
- *
- * @since API Level 16
*/
public interface IAutomationSupport {
@@ -32,7 +30,6 @@
*
* @param resultCode
* @param status status report, consisting of key value pairs
- * @since API Level 16
*/
void sendStatus(int resultCode, @NonNull Bundle status);
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/InteractionController.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/InteractionController.java
index f4d2ecb..ee4b9dc 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/InteractionController.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/InteractionController.java
@@ -721,7 +721,6 @@
* path. Each {@link PointerCoords} in an array constitute a point on a pointer's path.
* @return <code>true</code> if all points on all paths are injected successfully, <code>false
* </code>otherwise
- * @since API Level 18
*/
public boolean performMultiPointerGesture(PointerCoords[] ... touches) {
boolean ret = true;
@@ -805,7 +804,6 @@
* Simulates a short press on the Recent Apps button.
*
* @return true if successful, else return false
- * @since API Level 18
*/
public boolean toggleRecentApps() {
return getUiAutomation().performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS);
@@ -815,7 +813,6 @@
* Opens the notification shade
*
* @return true if successful, else return false
- * @since API Level 18
*/
public boolean openNotification() {
return getUiAutomation().performGlobalAction(AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS);
@@ -825,7 +822,6 @@
* Opens the quick settings shade
*
* @return true if successful, else return false
- * @since API Level 18
*/
public boolean openQuickSettings() {
return getUiAutomation().performGlobalAction(AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS);
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiAutomatorTestCase.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiAutomatorTestCase.java
index 8c8c71a8..914f9b3 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiAutomatorTestCase.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiAutomatorTestCase.java
@@ -37,7 +37,6 @@
/**
* Get current instance of {@link UiDevice}. Works similar to calling the static
* {@link UiDevice#getInstance()} from anywhere in the test classes.
- * @since API Level 16
*/
public UiDevice getUiDevice() {
return mDevice;
@@ -47,7 +46,6 @@
* Get command line parameters. On the command line when passing <code>-e key value</code>
* pairs, the {@link Bundle} will have the key value pairs conveniently available to the
* tests.
- * @since API Level 16
*/
public Bundle getParams() {
return mParams;
@@ -57,7 +55,6 @@
* Provides support for running tests to report interim status
*
* @return IAutomationSupport
- * @since API Level 16
* @deprecated Use {@link Instrumentation#sendStatus(int, Bundle)} instead
*/
@Deprecated
@@ -91,7 +88,6 @@
/**
* Calls {@link SystemClock#sleep(long)} to sleep
* @param ms is in milliseconds.
- * @since API Level 16
* @deprecated Use {@link SystemClock#sleep(long)} instead.
*/
@Deprecated
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiCollection.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiCollection.java
index 3225209..40b8b2a 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiCollection.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiCollection.java
@@ -21,7 +21,6 @@
/**
* Used to enumerate a container's UI elements for the purpose of counting,
* or targeting a sub elements by a child's text or description.
- * @since API Level 16
*/
public class UiCollection extends UiObject {
@@ -29,7 +28,6 @@
* Constructs an instance as described by the selector
*
* @param selector
- * @since API Level 16
*/
public UiCollection(@NonNull UiSelector selector) {
super(selector);
@@ -48,7 +46,6 @@
* @param text String of the identifying child contents of of the <code>childPattern</code>
* @return {@link UiObject} pointing at and instance of <code>childPattern</code>
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
public UiObject getChildByDescription(@NonNull UiSelector childPattern, @NonNull String text)
@@ -83,7 +80,6 @@
* @param childPattern {@link UiSelector} selector of the child pattern to match and return
* @param instance int the desired matched instance of this <code>childPattern</code>
* @return {@link UiObject} pointing at and instance of <code>childPattern</code>
- * @since API Level 16
*/
@NonNull
public UiObject getChildByInstance(@NonNull UiSelector childPattern, int instance)
@@ -108,7 +104,6 @@
* @param text String of the identifying child contents of of the <code>childPattern</code>
* @return {@link UiObject} pointing at and instance of <code>childPattern</code>
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
public UiObject getChildByText(@NonNull UiSelector childPattern, @NonNull String text)
@@ -140,7 +135,6 @@
* @param childPattern a {@link UiSelector} that represents the matching child UI
* elements to count
* @return the number of matched childPattern under the current {@link UiCollection}
- * @since API Level 16
*/
public int getChildCount(@NonNull UiSelector childPattern) {
Tracer.trace(childPattern);
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiDevice.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiDevice.java
index 6290872..7555a0c 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiDevice.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiDevice.java
@@ -66,7 +66,6 @@
* UiDevice provides access to state information about the device.
* You can also use this class to simulate user actions on the device,
* such as pressing the d-pad or pressing the Home and Menu buttons.
- * @since API Level 16
*/
public class UiDevice implements Searchable {
@@ -230,7 +229,6 @@
* and searching the hierarchy inefficient are removed.
*
* @param compressed true to enable compression; else, false to disable
- * @since API Level 18
*/
public void setCompressedLayoutHeirarchy(boolean compressed) {
AccessibilityServiceInfo info = getUiAutomation().getServiceInfo();
@@ -247,7 +245,6 @@
* @deprecated Should use {@link #getInstance(Instrumentation)} instead. This version hides
* UiDevice's dependency on having an Instrumentation reference and is prone to misuse.
* @return UiDevice instance
- * @since API Level 16
*/
@Deprecated
@NonNull
@@ -301,7 +298,6 @@
* the same as returned by invoking #adb shell getprop ro.product.name.
*
* @return product name of the device
- * @since API Level 17
*/
@NonNull
public String getProductName() {
@@ -322,7 +318,6 @@
* DOM instead.
*
* @return text of the last traversal event, else return an empty string
- * @since API Level 16
*/
@SuppressLint("UnknownNullness") // Avoid unnecessary null checks from nullable testing APIs.
public String getLastTraversedText() {
@@ -333,7 +328,6 @@
/**
* Clears the text from the last UI traversal event.
* See {@link #getLastTraversedText()}.
- * @since API Level 16
*/
public void clearLastTraversedText() {
Tracer.trace();
@@ -343,7 +337,6 @@
/**
* Simulates a short press on the MENU button.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressMenu() {
Tracer.trace();
@@ -356,7 +349,6 @@
/**
* Simulates a short press on the BACK button.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressBack() {
Tracer.trace();
@@ -369,7 +361,6 @@
/**
* Simulates a short press on the HOME button.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressHome() {
Tracer.trace();
@@ -382,7 +373,6 @@
/**
* Simulates a short press on the SEARCH button.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressSearch() {
Tracer.trace();
@@ -392,7 +382,6 @@
/**
* Simulates a short press on the CENTER button.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressDPadCenter() {
Tracer.trace();
@@ -402,7 +391,6 @@
/**
* Simulates a short press on the DOWN button.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressDPadDown() {
Tracer.trace();
@@ -412,7 +400,6 @@
/**
* Simulates a short press on the UP button.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressDPadUp() {
Tracer.trace();
@@ -422,7 +409,6 @@
/**
* Simulates a short press on the LEFT button.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressDPadLeft() {
Tracer.trace();
@@ -432,7 +418,6 @@
/**
* Simulates a short press on the RIGHT button.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressDPadRight() {
Tracer.trace();
@@ -442,7 +427,6 @@
/**
* Simulates a short press on the DELETE key.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressDelete() {
Tracer.trace();
@@ -452,7 +436,6 @@
/**
* Simulates a short press on the ENTER key.
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressEnter() {
Tracer.trace();
@@ -464,7 +447,6 @@
*
* See {@link KeyEvent}
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressKeyCode(int keyCode) {
Tracer.trace(keyCode);
@@ -479,7 +461,6 @@
* @param keyCode the key code of the event.
* @param metaState an integer in which each bit set to 1 represents a pressed meta key
* @return true if successful, else return false
- * @since API Level 16
*/
public boolean pressKeyCode(int keyCode, int metaState) {
Tracer.trace(keyCode, metaState);
@@ -492,7 +473,6 @@
*
* @return true if successful, else return false
* @throws RemoteException
- * @since API Level 16
*/
public boolean pressRecentApps() throws RemoteException {
Tracer.trace();
@@ -504,7 +484,6 @@
* Opens the notification shade.
*
* @return true if successful, else return false
- * @since API Level 18
*/
public boolean openNotification() {
Tracer.trace();
@@ -516,7 +495,6 @@
* Opens the Quick Settings shade.
*
* @return true if successful, else return false
- * @since API Level 18
*/
public boolean openQuickSettings() {
Tracer.trace();
@@ -528,7 +506,6 @@
* Gets the width of the display, in pixels. The width and height details
* are reported based on the current orientation of the display.
* @return width in pixels or zero on failure
- * @since API Level 16
*/
public int getDisplayWidth() {
Tracer.trace();
@@ -542,7 +519,6 @@
* Gets the height of the display, in pixels. The size is adjusted based
* on the current orientation of the display.
* @return height in pixels or zero on failure
- * @since API Level 16
*/
public int getDisplayHeight() {
Tracer.trace();
@@ -558,7 +534,6 @@
* @param x coordinate
* @param y coordinate
* @return true if the click succeeded else false
- * @since API Level 16
*/
public boolean click(int x, int y) {
Tracer.trace(x, y);
@@ -579,7 +554,6 @@
* @param endY
* @param steps is the number of move steps sent to the system
* @return false if the operation fails or the coordinates are invalid
- * @since API Level 16
*/
public boolean swipe(int startX, int startY, int endX, int endY, int steps) {
Tracer.trace(startX, startY, endX, endY, steps);
@@ -600,7 +574,6 @@
* @param steps is the number of steps for the swipe action
* @return true if swipe is performed, false if the operation fails
* or the coordinates are invalid
- * @since API Level 18
*/
public boolean drag(int startX, int startY, int endX, int endY, int steps) {
Tracer.trace(startX, startY, endX, endY, steps);
@@ -615,7 +588,6 @@
* @param segments is Point array containing at least one Point object
* @param segmentSteps steps to inject between two Points
* @return true on success
- * @since API Level 16
*/
public boolean swipe(@NonNull Point[] segments, int segmentSteps) {
Tracer.trace(segments, segmentSteps);
@@ -625,7 +597,6 @@
/**
* Waits for the current application to idle.
* Default wait timeout is 10 seconds
- * @since API Level 16
*/
public void waitForIdle() {
Tracer.trace();
@@ -635,7 +606,6 @@
/**
* Waits for the current application to idle.
* @param timeout in milliseconds
- * @since API Level 16
*/
public void waitForIdle(long timeout) {
Tracer.trace(timeout);
@@ -646,7 +616,6 @@
* Retrieves the last activity to report accessibility events.
* @deprecated The results returned should be considered unreliable
* @return String name of activity
- * @since API Level 16
*/
@Deprecated
@SuppressLint("UnknownNullness") // Avoid unnecessary null checks from nullable testing APIs.
@@ -658,7 +627,6 @@
/**
* Retrieves the name of the last package to report accessibility events.
* @return String name of package
- * @since API Level 16
*/
@SuppressLint("UnknownNullness") // Avoid unnecessary null checks from nullable testing APIs.
public String getCurrentPackageName() {
@@ -672,7 +640,6 @@
*
* @param name to register the UiWatcher
* @param watcher {@link UiWatcher}
- * @since API Level 16
*/
public void registerWatcher(@Nullable String name, @Nullable UiWatcher watcher) {
Tracer.trace(name, watcher);
@@ -687,7 +654,6 @@
*
* See {@link #registerWatcher(String, UiWatcher)}
* @param name used to register the UiWatcher
- * @since API Level 16
*/
public void removeWatcher(@Nullable String name) {
Tracer.trace(name);
@@ -700,7 +666,6 @@
/**
* This method forces all registered watchers to run.
* See {@link #registerWatcher(String, UiWatcher)}
- * @since API Level 16
*/
public void runWatchers() {
Tracer.trace();
@@ -730,7 +695,6 @@
* If a UiWatcher runs and its {@link UiWatcher#checkForCondition()} call
* returned <code>true</code>, then the UiWatcher is considered triggered.
* See {@link #registerWatcher(String, UiWatcher)}
- * @since API Level 16
*/
public void resetWatcherTriggers() {
Tracer.trace();
@@ -746,7 +710,6 @@
*
* @param watcherName
* @return true if triggered else false
- * @since API Level 16
*/
public boolean hasWatcherTriggered(@Nullable String watcherName) {
Tracer.trace(watcherName);
@@ -758,7 +721,6 @@
*
* See {@link #registerWatcher(String, UiWatcher)}
* See {@link #hasWatcherTriggered(String)}
- * @since API Level 16
*/
public boolean hasAnyWatcherTriggered() {
Tracer.trace();
@@ -780,7 +742,6 @@
* Check if the device is in its natural orientation. This is determined by checking if the
* orientation is at 0 or 180 degrees.
* @return true if it is in natural orientation
- * @since API Level 17
*/
public boolean isNaturalOrientation() {
Tracer.trace();
@@ -792,7 +753,6 @@
/**
* Returns the current rotation of the display, as defined in {@link Surface}
- * @since API Level 17
*/
public int getDisplayRotation() {
Tracer.trace();
@@ -804,7 +764,6 @@
* Disables the sensors and freezes the device rotation at its
* current rotation state.
* @throws RemoteException
- * @since API Level 16
*/
public void freezeRotation() throws RemoteException {
Tracer.trace();
@@ -829,7 +788,6 @@
* If you want to un-freeze the rotation and re-enable the sensors
* see {@link #unfreezeRotation()}.
* @throws RemoteException
- * @since API Level 17
*/
public void setOrientationLeft() throws RemoteException {
Tracer.trace();
@@ -844,7 +802,6 @@
* If you want to un-freeze the rotation and re-enable the sensors
* see {@link #unfreezeRotation()}.
* @throws RemoteException
- * @since API Level 17
*/
public void setOrientationRight() throws RemoteException {
Tracer.trace();
@@ -859,7 +816,6 @@
* If you want to un-freeze the rotation and re-enable the sensors
* see {@link #unfreezeRotation()}.
* @throws RemoteException
- * @since API Level 17
*/
public void setOrientationNatural() throws RemoteException {
Tracer.trace();
@@ -874,7 +830,6 @@
* If the screen was OFF and it just got turned ON, this method will insert a 500ms delay
* to allow the device time to wake up and accept input.
* @throws RemoteException
- * @since API Level 16
*/
public void wakeUp() throws RemoteException {
Tracer.trace();
@@ -890,7 +845,6 @@
*
* @return true if the screen is ON else false
* @throws RemoteException
- * @since API Level 16
*/
public boolean isScreenOn() throws RemoteException {
Tracer.trace();
@@ -902,7 +856,6 @@
* it does nothing if the screen is already OFF.
*
* @throws RemoteException
- * @since API Level 16
*/
public void sleep() throws RemoteException {
Tracer.trace();
@@ -914,7 +867,6 @@
* Relative file paths are stored the application's internal private storage location.
*
* @param fileName
- * @since API Level 16
* @deprecated Use {@link UiDevice#dumpWindowHierarchy(File)} or
* {@link UiDevice#dumpWindowHierarchy(OutputStream)} instead.
*/
@@ -967,7 +919,6 @@
*
* @return true if a window update occurred, false if timeout has elapsed or if the current
* window does not have the specified package name
- * @since API Level 16
*/
public boolean waitForWindowUpdate(@Nullable String packageName, long timeout) {
Tracer.trace(packageName, timeout);
@@ -1010,7 +961,6 @@
*
* @param storePath where the PNG should be written to
* @return true if screen shot is created successfully, false otherwise
- * @since API Level 17
*/
public boolean takeScreenshot(@NonNull File storePath) {
Tracer.trace(storePath);
@@ -1026,7 +976,6 @@
* @param scale scale the screenshot down if needed; 1.0f for original size
* @param quality quality of the PNG compression; range: 0-100
* @return true if screen shot is created successfully, false otherwise
- * @since API Level 17
*/
public boolean takeScreenshot(@NonNull File storePath, float scale, int quality) {
Tracer.trace(storePath, scale, quality);
@@ -1072,7 +1021,6 @@
* @param cmd the command to run
* @return the standard output of the command
* @throws IOException
- * @since API Level 21
* @hide
*/
@RequiresApi(21)
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiObject.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiObject.java
index 7894b1e..58e73a7 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiObject.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiObject.java
@@ -35,38 +35,19 @@
* locate a matching view at runtime based on the {@link UiSelector} properties specified in
* its constructor. Once you create an instance of a UiObject, it can
* be reused for different views that match the selector criteria.
- * @since API Level 16
*/
public class UiObject {
private static final String LOG_TAG = UiObject.class.getSimpleName();
- /**
- * @since API Level 16
- * @deprecated use {@link Configurator#setWaitForSelectorTimeout(long)}
- **/
+ /** @deprecated use {@link Configurator#setWaitForSelectorTimeout(long)} */
@Deprecated
protected static final long WAIT_FOR_SELECTOR_TIMEOUT = 10 * 1000;
- /**
- * @since API Level 16
- **/
protected static final long WAIT_FOR_SELECTOR_POLL = 1000;
// set a default timeout to 5.5s, since ANR threshold is 5s
- /**
- * @since API Level 16
- **/
protected static final long WAIT_FOR_WINDOW_TMEOUT = 5500;
- /**
- * @since API Level 16
- **/
protected static final int SWIPE_MARGIN_LIMIT = 5;
- /**
- * @since API Level 17
- * @deprecated use {@link Configurator#setScrollAcknowledgmentTimeout(long)}
- **/
+ /** @deprecated use {@link Configurator#setScrollAcknowledgmentTimeout(long)} */
@Deprecated
protected static final long WAIT_FOR_EVENT_TMEOUT = 3 * 1000;
- /**
- * @since API Level 18
- **/
protected static final int FINGER_TOUCH_HALF_WIDTH = 20;
private final UiSelector mUiSelector;
@@ -81,7 +62,6 @@
* @deprecated Use {@link UiDevice#findObject(UiSelector)} instead. This version hides
* UiObject's dependency on UiDevice and is prone to misuse.
* @param selector
- * @since API Level 16
*/
@Deprecated
public UiObject(UiSelector selector) {
@@ -103,7 +83,6 @@
* to its logs if needed. <code>getSelector().toString();</code>
*
* @return {@link UiSelector}
- * @since API Level 16
*/
@NonNull
public final UiSelector getSelector() {
@@ -143,7 +122,6 @@
*
* @param selector for child view to match
* @return a new UiObject representing the child view
- * @since API Level 16
*/
@NonNull
public UiObject getChild(@NonNull UiSelector selector) throws UiObjectNotFoundException {
@@ -158,7 +136,6 @@
* @param selector for a sibling view or children of the sibling view
* @return a new UiObject representing the matched view
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
public UiObject getFromParent(@NonNull UiSelector selector) throws UiObjectNotFoundException {
@@ -171,7 +148,6 @@
*
* @return the count of child views.
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public int getChildCount() throws UiObjectNotFoundException {
Tracer.trace();
@@ -188,7 +164,6 @@
*
* @param timeout in milliseconds
* @return AccessibilityNodeInfo if found else null
- * @since API Level 16
*/
@Nullable
protected AccessibilityNodeInfo findAccessibilityNodeInfo(long timeout) {
@@ -221,7 +196,6 @@
* @param steps usually 40 steps. You can increase or decrease the steps to change the speed.
* @return true if successful
* @throws UiObjectNotFoundException
- * @since API Level 18
*/
public boolean dragTo(@NonNull UiObject destObj, int steps) throws UiObjectNotFoundException {
Rect srcRect = getVisibleBounds();
@@ -241,7 +215,6 @@
* @param steps usually 40 steps. You can increase or decrease the steps to change the speed.
* @return true if successful
* @throws UiObjectNotFoundException
- * @since API Level 18
*/
public boolean dragTo(int destX, int destY, int steps) throws UiObjectNotFoundException {
Rect srcRect = getVisibleBounds();
@@ -263,7 +236,6 @@
* injected about 5ms apart. So a 100 steps may take about 1/2 second to complete.
* @return true of successful
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean swipeUp(int steps) throws UiObjectNotFoundException {
Tracer.trace(steps);
@@ -291,7 +263,6 @@
* injected about 5ms apart. So a 100 steps may take about 1/2 second to complete.
* @return true if successful
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean swipeDown(int steps) throws UiObjectNotFoundException {
Tracer.trace(steps);
@@ -319,7 +290,6 @@
* injected about 5ms apart. So a 100 steps may take about 1/2 second to complete.
* @return true if successful
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean swipeLeft(int steps) throws UiObjectNotFoundException {
Tracer.trace(steps);
@@ -346,7 +316,6 @@
* injected about 5ms apart. So a 100 steps may take about 1/2 second to complete.
* @return true if successful
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean swipeRight(int steps) throws UiObjectNotFoundException {
Tracer.trace(steps);
@@ -415,7 +384,6 @@
*
* @return true id successful else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean click() throws UiObjectNotFoundException {
Tracer.trace();
@@ -435,7 +403,6 @@
*
* @return true if the event was triggered, else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean clickAndWaitForNewWindow() throws UiObjectNotFoundException {
Tracer.trace();
@@ -457,7 +424,6 @@
* @param timeout timeout before giving up on waiting for a new window
* @return true if the event was triggered, else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean clickAndWaitForNewWindow(long timeout) throws UiObjectNotFoundException {
Tracer.trace(timeout);
@@ -475,7 +441,6 @@
*
* @return true on success
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean clickTopLeft() throws UiObjectNotFoundException {
Tracer.trace();
@@ -493,7 +458,6 @@
*
* @return true if operation was successful
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean longClickBottomRight() throws UiObjectNotFoundException {
Tracer.trace();
@@ -511,7 +475,6 @@
*
* @return true on success
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean clickBottomRight() throws UiObjectNotFoundException {
Tracer.trace();
@@ -529,7 +492,6 @@
*
* @return true if operation was successful
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean longClick() throws UiObjectNotFoundException {
Tracer.trace();
@@ -547,7 +509,6 @@
*
* @return true if operation was successful
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean longClickTopLeft() throws UiObjectNotFoundException {
Tracer.trace();
@@ -565,7 +526,6 @@
*
* @return text value of the current node represented by this UiObject
* @throws UiObjectNotFoundException if no match could be found
- * @since API Level 16
*/
@NonNull
public String getText() throws UiObjectNotFoundException {
@@ -584,7 +544,6 @@
*
* @return class name of the current node represented by this UiObject
* @throws UiObjectNotFoundException if no match was found
- * @since API Level 18
*/
@NonNull
public String getClassName() throws UiObjectNotFoundException {
@@ -603,7 +562,6 @@
*
* @return value of node attribute "content_desc"
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
public String getContentDescription() throws UiObjectNotFoundException {
@@ -667,7 +625,6 @@
* @param text string to set
* @return true if operation is successful
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean setText(@Nullable String text) throws UiObjectNotFoundException {
// per framework convention, setText with null means clearing it
@@ -700,7 +657,6 @@
* existing content, and clears it by sending a DELETE key press
*
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public void clearTextField() throws UiObjectNotFoundException {
Tracer.trace();
@@ -738,7 +694,6 @@
* Check if the UI element's <code>checked</code> property is currently true
*
* @return true if it is else false
- * @since API Level 16
*/
public boolean isChecked() throws UiObjectNotFoundException {
Tracer.trace();
@@ -754,7 +709,6 @@
*
* @return true if it is else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean isSelected() throws UiObjectNotFoundException {
Tracer.trace();
@@ -770,7 +724,6 @@
*
* @return true if it is else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean isCheckable() throws UiObjectNotFoundException {
Tracer.trace();
@@ -786,7 +739,6 @@
*
* @return true if it is else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean isEnabled() throws UiObjectNotFoundException {
Tracer.trace();
@@ -802,7 +754,6 @@
*
* @return true if it is else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean isClickable() throws UiObjectNotFoundException {
Tracer.trace();
@@ -818,7 +769,6 @@
*
* @return true if it is else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean isFocused() throws UiObjectNotFoundException {
Tracer.trace();
@@ -834,7 +784,6 @@
*
* @return true if it is else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean isFocusable() throws UiObjectNotFoundException {
Tracer.trace();
@@ -850,7 +799,6 @@
*
* @return true if it is else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean isScrollable() throws UiObjectNotFoundException {
Tracer.trace();
@@ -866,7 +814,6 @@
*
* @return true if it is else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
public boolean isLongClickable() throws UiObjectNotFoundException {
Tracer.trace();
@@ -882,7 +829,6 @@
*
* @return true if it is else false
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
public String getPackageName() throws UiObjectNotFoundException {
@@ -903,8 +849,6 @@
* @return Rect
* @throws UiObjectNotFoundException
* @see #getBounds()
- *
- * @since API Level 17
*/
@NonNull
public Rect getVisibleBounds() throws UiObjectNotFoundException {
@@ -921,7 +865,6 @@
*
* @return Rect
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
public Rect getBounds() throws UiObjectNotFoundException {
@@ -945,7 +888,6 @@
*
* @param timeout the amount of time to wait (in milliseconds)
* @return true if the view is displayed, else false if timeout elapsed while waiting
- * @since API Level 16
*/
public boolean waitForExists(long timeout) {
Tracer.trace(timeout);
@@ -971,7 +913,6 @@
* @param timeout time to wait (in milliseconds)
* @return true if the element is gone before timeout elapsed, else false if timeout elapsed
* but a matching element is still found.
- * @since API Level 16
*/
public boolean waitUntilGone(long timeout) {
Tracer.trace(timeout);
@@ -996,7 +937,6 @@
* {@link #waitForExists(long)}.
*
* @return true if the view represented by this UiObject does exist
- * @since API Level 16
*/
public boolean exists() {
Tracer.trace();
@@ -1019,7 +959,6 @@
* @return <code>true</code> if all touch events for this gesture are injected successfully,
* <code>false</code> otherwise
* @throws UiObjectNotFoundException
- * @since API Level 18
*/
public boolean pinchOut(int percent, int steps) throws UiObjectNotFoundException {
// make value between 1 and 100
@@ -1057,7 +996,6 @@
* @return <code>true</code> if all touch events for this gesture are injected successfully,
* <code>false</code> otherwise
* @throws UiObjectNotFoundException
- * @since API Level 18
*/
public boolean pinchIn(int percent, int steps) throws UiObjectNotFoundException {
// make value between 1 and 100
@@ -1095,7 +1033,6 @@
* about 5 milliseconds apart, so 100 steps may take around 0.5 seconds to complete.
* @return <code>true</code> if all touch events for this gesture are injected successfully,
* <code>false</code> otherwise
- * @since API Level 18
*/
public boolean performTwoPointerGesture(@NonNull Point startPoint1, @NonNull Point startPoint2,
@NonNull Point endPoint1, @NonNull Point endPoint2, int steps) {
@@ -1179,7 +1116,6 @@
* 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
- * @since API Level 18
*/
public boolean performMultiPointerGesture(@NonNull PointerCoords[]... touches) {
return getInteractionController().performMultiPointerGesture(touches);
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiObjectNotFoundException.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiObjectNotFoundException.java
index db0c494..9fc254a 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiObjectNotFoundException.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiObjectNotFoundException.java
@@ -22,29 +22,19 @@
/**
* Generated in test runs when a {@link UiSelector} selector could not be matched
* to any UI element displayed.
- * @since API Level 16
*/
public class UiObjectNotFoundException extends Exception {
private static final long serialVersionUID = 1L;
- /**
- * @since API Level 16
- **/
public UiObjectNotFoundException(@NonNull String msg) {
super(msg);
}
- /**
- * @since API Level 16
- **/
public UiObjectNotFoundException(@NonNull String detailMessage, @Nullable Throwable throwable) {
super(detailMessage, throwable);
}
- /**
- * @since API Level 16
- **/
public UiObjectNotFoundException(@Nullable Throwable throwable) {
super(throwable);
}
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiScrollable.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiScrollable.java
index bc2e4f7..c60e8c0 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiScrollable.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiScrollable.java
@@ -26,7 +26,6 @@
* UiScrollable is a {@link UiCollection} and provides support for searching
* for items in scrollable layout elements. This class can be used with
* horizontally or vertically scrollable controls.
- * @since API Level 16
*/
public class UiScrollable extends UiCollection {
private static final String LOG_TAG = UiScrollable.class.getSimpleName();
@@ -52,7 +51,6 @@
*
* @param container a {@link UiSelector} selector to identify the scrollable
* layout element.
- * @since API Level 16
*/
public UiScrollable(@NonNull UiSelector container) {
// wrap the container selector with container so that QueryController can handle
@@ -63,7 +61,6 @@
/**
* Set the direction of swipes to be vertical when performing scroll actions.
* @return reference to itself
- * @since API Level 16
*/
@NonNull
public UiScrollable setAsVerticalList() {
@@ -75,7 +72,6 @@
/**
* Set the direction of swipes to be horizontal when performing scroll actions.
* @return reference to itself
- * @since API Level 16
*/
@NonNull
public UiScrollable setAsHorizontalList() {
@@ -90,7 +86,6 @@
*
* @param selector
* @return true if found else false
- * @since API Level 16
*/
protected boolean exists(@NonNull UiSelector selector) {
if(getQueryController().findAccessibilityNodeInfo(selector) != null) {
@@ -114,7 +109,6 @@
* the <code>childPattern</code> match
* @return {@link UiObject} representing the child element that matches the search conditions
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
@Override
@@ -139,7 +133,6 @@
* @param allowScrollSearch set to true if scrolling is allowed
* @return {@link UiObject} representing the child element that matches the search conditions
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
public UiObject getChildByDescription(@NonNull UiSelector childPattern, @NonNull String text,
@@ -163,7 +156,6 @@
* @param instance int number representing the occurance of
* a <code>childPattern</code> match
* @return {@link UiObject} representing the child element that matches the search conditions
- * @since API Level 16
*/
@NonNull
@Override
@@ -189,7 +181,6 @@
* @param text String to find in the children of the <code>childPattern</code> match
* @return {@link UiObject} representing the child element that matches the search conditions
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
@Override
@@ -212,7 +203,6 @@
* @param allowScrollSearch set to true if scrolling is allowed
* @return {@link UiObject} representing the child element that matches the search conditions
* @throws UiObjectNotFoundException
- * @since API Level 16
*/
@NonNull
public UiObject getChildByText(@NonNull UiSelector childPattern,
@@ -236,7 +226,6 @@
* @param text content-description to find within the contents of this scrollable layout
* element.
* @return true if item is found; else, false
- * @since API Level 16
*/
public boolean scrollDescriptionIntoView(@NonNull String text)
throws UiObjectNotFoundException {
@@ -250,7 +239,6 @@
*
* @param obj {@link UiObject}
* @return true if the item was found and now is in view else false
- * @since API Level 16
*/
public boolean scrollIntoView(@NonNull UiObject obj) throws UiObjectNotFoundException {
Tracer.trace(obj.getSelector());
@@ -265,7 +253,6 @@
*
* @param selector {@link UiSelector} selector
* @return true if the item was found and now is in view; else, false
- * @since API Level 16
*/
public boolean scrollIntoView(@NonNull UiSelector selector) throws UiObjectNotFoundException {
Tracer.trace(selector);
@@ -343,7 +330,6 @@
*
* @param text test to look for
* @return true if item is found; else, false
- * @since API Level 16
*/
public boolean scrollTextIntoView(@NonNull String text) throws UiObjectNotFoundException {
Tracer.trace(text);
@@ -358,7 +344,6 @@
*
* @param swipes the number of search swipes to perform until giving up
* @return reference to itself
- * @since API Level 16
*/
@NonNull
public UiScrollable setMaxSearchSwipes(int swipes) {
@@ -374,7 +359,6 @@
* {@link #getChildByText(UiSelector, String)}.
*
* @return max the number of search swipes to perform until giving up
- * @since API Level 16
*/
public int getMaxSearchSwipes() {
Tracer.trace();
@@ -390,7 +374,6 @@
* right-to-left languages like Arabic and Hebrew.
*
* @return true if scrolled, false if can't scroll anymore
- * @since API Level 16
*/
public boolean flingForward() throws UiObjectNotFoundException {
Tracer.trace();
@@ -406,7 +389,6 @@
* right-to-left languages like Arabic and Hebrew.
*
* @return true if scrolled, false if can't scroll anymore
- * @since API Level 16
*/
public boolean scrollForward() throws UiObjectNotFoundException {
Tracer.trace();
@@ -422,7 +404,6 @@
*
* @param steps number of steps. Use this to control the speed of the scroll action
* @return true if scrolled, false if can't scroll anymore
- * @since API Level 16
*/
public boolean scrollForward(int steps) throws UiObjectNotFoundException {
Tracer.trace(steps);
@@ -469,7 +450,6 @@
* right-to-left languages like Arabic and Hebrew.
*
* @return true if scrolled, and false if can't scroll anymore
- * @since API Level 16
*/
public boolean flingBackward() throws UiObjectNotFoundException {
Tracer.trace();
@@ -485,7 +465,6 @@
* right-to-left languages like Arabic and Hebrew.
*
* @return true if scrolled, and false if can't scroll anymore
- * @since API Level 16
*/
public boolean scrollBackward() throws UiObjectNotFoundException {
Tracer.trace();
@@ -501,7 +480,6 @@
*
* @param steps number of steps. Use this to control the speed of the scroll action.
* @return true if scrolled, false if can't scroll anymore
- * @since API Level 16
*/
public boolean scrollBackward(int steps) throws UiObjectNotFoundException {
Tracer.trace(steps);
@@ -549,7 +527,6 @@
*
* @param steps use steps to control the speed, so that it may be a scroll, or fling
* @return true on scrolled else false
- * @since API Level 16
*/
public boolean scrollToBeginning(int maxSwipes, int steps) throws UiObjectNotFoundException {
Tracer.trace(maxSwipes, steps);
@@ -571,7 +548,6 @@
*
* @param maxSwipes
* @return true on scrolled else false
- * @since API Level 16
*/
public boolean scrollToBeginning(int maxSwipes) throws UiObjectNotFoundException {
Tracer.trace(maxSwipes);
@@ -586,7 +562,6 @@
*
* @param maxSwipes
* @return true on scrolled else false
- * @since API Level 16
*/
public boolean flingToBeginning(int maxSwipes) throws UiObjectNotFoundException {
Tracer.trace(maxSwipes);
@@ -601,7 +576,6 @@
*
* @param steps use steps to control the speed, so that it may be a scroll, or fling
* @return true on scrolled else false
- * @since API Level 16
*/
public boolean scrollToEnd(int maxSwipes, int steps) throws UiObjectNotFoundException {
Tracer.trace(maxSwipes, steps);
@@ -622,7 +596,6 @@
*
* @param maxSwipes
* @return true on scrolled, else false
- * @since API Level 16
*/
public boolean scrollToEnd(int maxSwipes) throws UiObjectNotFoundException {
Tracer.trace(maxSwipes);
@@ -637,7 +610,6 @@
*
* @param maxSwipes
* @return true on scrolled, else false
- * @since API Level 16
*/
public boolean flingToEnd(int maxSwipes) throws UiObjectNotFoundException {
Tracer.trace(maxSwipes);
@@ -653,7 +625,6 @@
* too near to the edge. The default is 10% from either edge.
*
* @return a value between 0 and 1
- * @since API Level 16
*/
public double getSwipeDeadZonePercentage() {
Tracer.trace();
@@ -671,7 +642,6 @@
*
* @param swipeDeadZonePercentage is a value between 0 and 1
* @return reference to itself
- * @since API Level 16
*/
@NonNull
public UiScrollable setSwipeDeadZonePercentage(double swipeDeadZonePercentage) {
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiSelector.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiSelector.java
index d50782d..074b7aa 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiSelector.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiSelector.java
@@ -28,7 +28,6 @@
* by properties such as text value, content-description, class name, and state
* information. You can also target an element by its location in a layout
* hierarchy.
- * @since API Level 16
*/
public class UiSelector {
static final int SELECTOR_NIL = 0;
@@ -66,9 +65,6 @@
private SparseArray<Object> mSelectorAttributes = new SparseArray<Object>();
- /**
- * @since API Level 16
- */
public UiSelector() {
}
@@ -76,9 +72,6 @@
mSelectorAttributes = selector.cloneSelector().mSelectorAttributes;
}
- /**
- * @since API Level 17
- */
@NonNull
protected UiSelector cloneSelector() {
UiSelector ret = new UiSelector();
@@ -113,7 +106,6 @@
*
* @param text Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector text(@NonNull String text) {
@@ -132,7 +124,6 @@
*
* @param regex a regular expression
* @return UiSelector with the specified search criteria
- * @since API Level 17
*/
@NonNull
public UiSelector textMatches(@NonNull String regex) {
@@ -150,7 +141,6 @@
*
* @param text Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector textStartsWith(@NonNull String text) {
@@ -168,7 +158,6 @@
*
* @param text Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector textContains(@NonNull String text) {
@@ -184,7 +173,6 @@
*
* @param className Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector className(@NonNull String className) {
@@ -200,7 +188,6 @@
*
* @param regex a regular expression
* @return UiSelector with the specified search criteria
- * @since API Level 17
*/
@NonNull
public UiSelector classNameMatches(@NonNull String regex) {
@@ -216,7 +203,6 @@
*
* @param type type
* @return UiSelector with the specified search criteria
- * @since API Level 17
*/
@NonNull
public <T> UiSelector className(@NonNull Class<T> type) {
@@ -241,7 +227,6 @@
*
* @param desc Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector description(@NonNull String desc) {
@@ -264,7 +249,6 @@
*
* @param regex a regular expression
* @return UiSelector with the specified search criteria
- * @since API Level 17
*/
@NonNull
public UiSelector descriptionMatches(@NonNull String regex) {
@@ -289,7 +273,6 @@
*
* @param desc Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector descriptionStartsWith(@NonNull String desc) {
@@ -314,7 +297,6 @@
*
* @param desc Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector descriptionContains(@NonNull String desc) {
@@ -329,7 +311,6 @@
*
* @param id Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 18
*/
@NonNull
public UiSelector resourceId(@NonNull String id) {
@@ -345,7 +326,6 @@
*
* @param regex a regular expression
* @return UiSelector with the specified search criteria
- * @since API Level 18
*/
@NonNull
public UiSelector resourceIdMatches(@NonNull String regex) {
@@ -367,7 +347,6 @@
*
* @param index Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector index(final int index) {
@@ -394,7 +373,6 @@
*
* @param instance Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector instance(final int instance) {
@@ -414,7 +392,6 @@
*
* @param val Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector enabled(boolean val) {
@@ -434,7 +411,6 @@
*
* @param val Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector focused(boolean val) {
@@ -454,7 +430,6 @@
*
* @param val Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector focusable(boolean val) {
@@ -474,7 +449,6 @@
*
* @param val Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector scrollable(boolean val) {
@@ -495,7 +469,6 @@
*
* @param val Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector selected(boolean val) {
@@ -516,7 +489,6 @@
*
* @param val Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector checked(boolean val) {
@@ -536,7 +508,6 @@
*
* @param val Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector clickable(boolean val) {
@@ -556,7 +527,6 @@
*
* @param val Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 18
*/
@NonNull
public UiSelector checkable(boolean val) {
@@ -576,7 +546,6 @@
*
* @param val Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 17
*/
@NonNull
public UiSelector longClickable(boolean val) {
@@ -591,7 +560,6 @@
*
* @param selector
* @return UiSelector with this added search criterion
- * @since API Level 16
*/
@NonNull
public UiSelector childSelector(@NonNull UiSelector selector) {
@@ -618,7 +586,6 @@
*
* @param selector
* @return UiSelector with this added search criterion
- * @since API Level 16
*/
@NonNull
public UiSelector fromParent(@NonNull UiSelector selector) {
@@ -634,7 +601,6 @@
*
* @param name Value to match
* @return UiSelector with the specified search criteria
- * @since API Level 16
*/
@NonNull
public UiSelector packageName(@NonNull String name) {
@@ -650,7 +616,6 @@
*
* @param regex a regular expression
* @return UiSelector with the specified search criteria
- * @since API Level 17
*/
@NonNull
public UiSelector packageNameMatches(@NonNull String regex) {
diff --git a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiWatcher.java b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiWatcher.java
index 31c81d3..ed07f0c 100644
--- a/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiWatcher.java
+++ b/test/uiautomator/uiautomator/src/main/java/androidx/test/uiautomator/UiWatcher.java
@@ -22,7 +22,6 @@
* invoke checkForCondition() only when a regular API call is in retry mode because it is unable
* to locate its selector yet. Only during this time, the watchers are invoked to check if there is
* something else unexpected on the screen.
- * @since API Level 16
*/
public interface UiWatcher {
@@ -43,7 +42,6 @@
* currently under test.
*
* @return true to indicate a matched condition or false for nothing was matched
- * @since API Level 16
*/
public boolean checkForCondition();
}
