aboutsummaryrefslogtreecommitdiff
path: root/src/io/appium/droiddriver/helpers
diff options
context:
space:
mode:
authorEric Fitchett <efitchett@google.com>2015-12-02 12:20:13 -0500
committerEric Fitchett <efitchett@google.com>2016-02-16 14:28:32 -0500
commit71ab195d6034efb023efaf6def8e5246262d2e66 (patch)
tree78bfd745929d9442c88e2abf60f80b65b4688589 /src/io/appium/droiddriver/helpers
parent675040fd1a83ee2505e1109489adcc0d666f61ea (diff)
downloaddroiddriver-71ab195d6034efb023efaf6def8e5246262d2e66.tar.gz
Added DuoDriver.
Automatically uses the most appropriate DroidDriver implementation. Uses InstrumentationDriver for activities owned by the application under instrumentation. Uses UiAutomationDriver for all others. Change-Id: Iea232a8c3ef590d170fd2ca47c78f515fe0ec57c
Diffstat (limited to 'src/io/appium/droiddriver/helpers')
-rw-r--r--src/io/appium/droiddriver/helpers/DroidDrivers.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/io/appium/droiddriver/helpers/DroidDrivers.java b/src/io/appium/droiddriver/helpers/DroidDrivers.java
index 7725bf5..f48a777 100644
--- a/src/io/appium/droiddriver/helpers/DroidDrivers.java
+++ b/src/io/appium/droiddriver/helpers/DroidDrivers.java
@@ -19,11 +19,10 @@ package io.appium.droiddriver.helpers;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.os.Build;
-
import io.appium.droiddriver.DroidDriver;
+import io.appium.droiddriver.duo.DuoDriver;
import io.appium.droiddriver.exceptions.DroidDriverException;
import io.appium.droiddriver.instrumentation.InstrumentationDriver;
-import io.appium.droiddriver.uiautomation.UiAutomationDriver;
import io.appium.droiddriver.util.InstrumentationUtils;
/**
@@ -83,7 +82,7 @@ public class DroidDrivers {
// If "dd.driver" is not specified, return default.
if (hasUiAutomation()) {
checkUiAutomation();
- return new UiAutomationDriver(instrumentation);
+ return new DuoDriver();
}
return new InstrumentationDriver(instrumentation);
}