From 2721cd91087f866e6a4c9d1d62221a36c31c4cd6 Mon Sep 17 00:00:00 2001 From: Kevin Jin Date: Tue, 10 Feb 2015 17:05:30 -0800 Subject: Build droiddriver as an Android library with Gradle Update minSdkVersion to 12 Add @TargetApi appropriatedly to fix lint errors Remove Eclipse files Change-Id: I661d3fd0e8b2517ae9ee4ba1e489031a8846130d --- .../droiddriver/actions/accessibility/AccessibilityClickAction.java | 2 ++ .../actions/accessibility/AccessibilityScrollAction.java | 2 ++ src/com/google/android/droiddriver/helpers/DroidDrivers.java | 2 ++ src/com/google/android/droiddriver/runner/TestRunner.java | 6 +++++- .../droiddriver/scroll/AccessibilityEventScrollStepStrategy.java | 2 ++ .../android/droiddriver/uiautomation/UiAutomationContext.java | 2 ++ .../google/android/droiddriver/uiautomation/UiAutomationDriver.java | 2 ++ .../android/droiddriver/uiautomation/UiAutomationElement.java | 2 ++ .../android/droiddriver/uiautomation/UiAutomationInputInjector.java | 2 ++ .../android/droiddriver/uiautomation/UiAutomationUiDevice.java | 2 ++ .../droiddriver/validators/DefaultAccessibilityValidator.java | 2 ++ 11 files changed, 25 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityClickAction.java b/src/com/google/android/droiddriver/actions/accessibility/AccessibilityClickAction.java index 0e7cc2b..91ab740 100644 --- a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityClickAction.java +++ b/src/com/google/android/droiddriver/actions/accessibility/AccessibilityClickAction.java @@ -16,6 +16,7 @@ package com.google.android.droiddriver.actions.accessibility; +import android.annotation.TargetApi; import android.view.accessibility.AccessibilityNodeInfo; import com.google.android.droiddriver.UiElement; @@ -24,6 +25,7 @@ import com.google.android.droiddriver.exceptions.ActionException; /** * An {@link AccessibilityAction} that clicks on a UiElement. */ +@TargetApi(18) public abstract class AccessibilityClickAction extends AccessibilityAction { public static final AccessibilityClickAction SINGLE = new SingleClick(1000L); diff --git a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityScrollAction.java b/src/com/google/android/droiddriver/actions/accessibility/AccessibilityScrollAction.java index bdeddc8..7095867 100644 --- a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityScrollAction.java +++ b/src/com/google/android/droiddriver/actions/accessibility/AccessibilityScrollAction.java @@ -16,6 +16,7 @@ package com.google.android.droiddriver.actions.accessibility; +import android.annotation.TargetApi; import android.view.accessibility.AccessibilityNodeInfo; import com.google.android.droiddriver.UiElement; @@ -26,6 +27,7 @@ import com.google.android.droiddriver.util.Strings; /** * An {@link AccessibilityAction} that scrolls an UiElement. */ +@TargetApi(18) public class AccessibilityScrollAction extends AccessibilityAction implements ScrollAction { private final PhysicalDirection direction; diff --git a/src/com/google/android/droiddriver/helpers/DroidDrivers.java b/src/com/google/android/droiddriver/helpers/DroidDrivers.java index c281075..4555b84 100644 --- a/src/com/google/android/droiddriver/helpers/DroidDrivers.java +++ b/src/com/google/android/droiddriver/helpers/DroidDrivers.java @@ -16,6 +16,7 @@ package com.google.android.droiddriver.helpers; +import android.annotation.TargetApi; import android.app.Instrumentation; import android.os.Build; import android.os.Bundle; @@ -135,6 +136,7 @@ public class DroidDrivers { } /** Returns a new UiAutomationDriver */ + @TargetApi(18) public static UiAutomationDriver newUiAutomationDriver(Instrumentation instrumentation) { if (!hasUiAutomation()) { throw new DroidDriverException("UiAutomation is not available below API 18. " diff --git a/src/com/google/android/droiddriver/runner/TestRunner.java b/src/com/google/android/droiddriver/runner/TestRunner.java index e6277fb..0518294 100644 --- a/src/com/google/android/droiddriver/runner/TestRunner.java +++ b/src/com/google/android/droiddriver/runner/TestRunner.java @@ -16,6 +16,7 @@ package com.google.android.droiddriver.runner; +import android.annotation.TargetApi; import android.app.Activity; import android.os.Build; import android.os.Bundle; @@ -65,8 +66,11 @@ public class TestRunner extends InstrumentationTestRunner { * Adds a {@link TestListener} that finishes all created activities. */ @Override + @TargetApi(18) public void onStart() { - DroidDrivers.initInstrumentation(this, getArguments()); + if (Build.VERSION.SDK_INT >= 18) { + DroidDrivers.initInstrumentation(this, getArguments()); + } getAndroidTestRunner().addTestListener(new TestListener() { @Override diff --git a/src/com/google/android/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java b/src/com/google/android/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java index f903746..840685e 100644 --- a/src/com/google/android/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java +++ b/src/com/google/android/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java @@ -15,6 +15,7 @@ */ package com.google.android.droiddriver.scroll; +import android.annotation.TargetApi; import android.app.UiAutomation; import android.app.UiAutomation.AccessibilityEventFilter; import android.util.Log; @@ -44,6 +45,7 @@ import java.util.concurrent.TimeoutException; * correct {@link AccessibilityEvent}s after scrolling. *

*/ +@TargetApi(18) public class AccessibilityEventScrollStepStrategy implements ScrollStepStrategy { /** * Stores the data if we reached end at the last {@link #scroll}. If the data diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationContext.java b/src/com/google/android/droiddriver/uiautomation/UiAutomationContext.java index 253d4e5..ef13bfb 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationContext.java +++ b/src/com/google/android/droiddriver/uiautomation/UiAutomationContext.java @@ -16,6 +16,7 @@ package com.google.android.droiddriver.uiautomation; +import android.annotation.TargetApi; import android.app.Instrumentation; import android.app.UiAutomation; import android.view.accessibility.AccessibilityNodeInfo; @@ -23,6 +24,7 @@ import android.view.accessibility.AccessibilityNodeInfo; import com.google.android.droiddriver.base.DroidDriverContext; import com.google.android.droiddriver.exceptions.UnrecoverableException; +@TargetApi(18) public class UiAutomationContext extends DroidDriverContext { private final UiAutomation uiAutomation; diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationDriver.java b/src/com/google/android/droiddriver/uiautomation/UiAutomationDriver.java index f139a15..9ace07e 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationDriver.java +++ b/src/com/google/android/droiddriver/uiautomation/UiAutomationDriver.java @@ -16,6 +16,7 @@ package com.google.android.droiddriver.uiautomation; +import android.annotation.TargetApi; import android.app.Instrumentation; import android.app.UiAutomation; import android.content.Context; @@ -34,6 +35,7 @@ import com.google.android.droiddriver.util.Logs; * Implementation of DroidDriver that gets attributes via the Accessibility API * and is acted upon via synthesized events. */ +@TargetApi(18) public class UiAutomationDriver extends BaseDroidDriver { // TODO: magic const from UiAutomator, but may not be useful /** diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationElement.java b/src/com/google/android/droiddriver/uiautomation/UiAutomationElement.java index e737bc6..cc9b315 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationElement.java +++ b/src/com/google/android/droiddriver/uiautomation/UiAutomationElement.java @@ -18,6 +18,7 @@ package com.google.android.droiddriver.uiautomation; import static com.google.android.droiddriver.util.Strings.charSequenceToString; +import android.annotation.TargetApi; import android.app.UiAutomation; import android.app.UiAutomation.AccessibilityEventFilter; import android.graphics.Rect; @@ -41,6 +42,7 @@ import java.util.concurrent.TimeoutException; /** * A UiElement that gets attributes via the Accessibility API. */ +@TargetApi(18) public class UiAutomationElement extends BaseUiElement { private static final AccessibilityEventFilter ANY_EVENT_FILTER = new AccessibilityEventFilter() { @Override diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationInputInjector.java b/src/com/google/android/droiddriver/uiautomation/UiAutomationInputInjector.java index 94d3ab4..ddbed5f 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationInputInjector.java +++ b/src/com/google/android/droiddriver/uiautomation/UiAutomationInputInjector.java @@ -16,12 +16,14 @@ package com.google.android.droiddriver.uiautomation; +import android.annotation.TargetApi; import android.app.UiAutomation; import android.view.InputEvent; import com.google.android.droiddriver.actions.InputInjector; import com.google.android.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; +@TargetApi(18) public class UiAutomationInputInjector implements InputInjector { private final UiAutomationContext context; diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationUiDevice.java b/src/com/google/android/droiddriver/uiautomation/UiAutomationUiDevice.java index a376cb6..06a417e 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationUiDevice.java +++ b/src/com/google/android/droiddriver/uiautomation/UiAutomationUiDevice.java @@ -16,6 +16,7 @@ package com.google.android.droiddriver.uiautomation; +import android.annotation.TargetApi; import android.app.UiAutomation; import android.graphics.Bitmap; import android.util.Log; @@ -25,6 +26,7 @@ import com.google.android.droiddriver.exceptions.UnrecoverableException; import com.google.android.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; import com.google.android.droiddriver.util.Logs; +@TargetApi(18) class UiAutomationUiDevice extends BaseUiDevice { private final UiAutomationContext context; diff --git a/src/com/google/android/droiddriver/validators/DefaultAccessibilityValidator.java b/src/com/google/android/droiddriver/validators/DefaultAccessibilityValidator.java index 5f49bcd..a150c8f 100644 --- a/src/com/google/android/droiddriver/validators/DefaultAccessibilityValidator.java +++ b/src/com/google/android/droiddriver/validators/DefaultAccessibilityValidator.java @@ -16,6 +16,7 @@ package com.google.android.droiddriver.validators; +import android.annotation.TargetApi; import android.text.TextUtils; import android.view.accessibility.AccessibilityNodeInfo; @@ -26,6 +27,7 @@ import com.google.android.droiddriver.uiautomation.UiAutomationElement; /** * Fall-back Validator for accessibility. */ +@TargetApi(14) public class DefaultAccessibilityValidator implements Validator { @Override public boolean isApplicable(UiElement element, Action action) { -- cgit v1.2.3