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

1 files changed, 2 insertions, 60 deletions

diff --git a/src/io/appium/droiddriver/base/BaseDroidDriver.java b/src/io/appium/droiddriver/base/BaseDroidDriver.java
index e985a38..827bce6 100644
--- a/src/io/appium/droiddriver/base/BaseDroidDriver.java
+++ b/src/io/appium/droiddriver/base/BaseDroidDriver.java
@@ -17,23 +17,16 @@
 package io.appium.droiddriver.base;
 
 import android.util.Log;
-
-import io.appium.droiddriver.DroidDriver;
-import io.appium.droiddriver.Poller;
 import io.appium.droiddriver.UiElement;
-import io.appium.droiddriver.actions.InputInjector;
-import io.appium.droiddriver.exceptions.ElementNotFoundException;
-import io.appium.droiddriver.exceptions.TimeoutException;
 import io.appium.droiddriver.finders.ByXPath;
 import io.appium.droiddriver.finders.Finder;
 import io.appium.droiddriver.util.Logs;
 
 /**
- * Base DroidDriver that implements the common operations.
+ * Enhances AbstractDroidDriver to include basic element handling and matching operations.
  */
-public abstract class BaseDroidDriver<R, E extends BaseUiElement<R, E>> implements DroidDriver {
+public abstract class BaseDroidDriver<R, E extends BaseUiElement<R, E>> extends AbstractDroidDriver {
 
-  private Poller poller = new DefaultPoller();
   private E rootElement;
 
   @Override
@@ -42,57 +35,6 @@ public abstract class BaseDroidDriver<R, E extends BaseUiElement<R, E>> implemen
     return finder.find(getRootElement());
   }
 
-  @Override
-  public boolean has(Finder finder) {
-    try {
-      refreshUiElementTree();
-      find(finder);
-      return true;
-    } catch (ElementNotFoundException enfe) {
-      return false;
-    }
-  }
-
-  @Override
-  public boolean has(Finder finder, long timeoutMillis) {
-    try {
-      getPoller().pollFor(this, finder, Poller.EXISTS, timeoutMillis);
-      return true;
-    } catch (TimeoutException e) {
-      return false;
-    }
-  }
-
-  @Override
-  public UiElement on(Finder finder) {
-    Logs.call(this, "on", finder);
-    return getPoller().pollFor(this, finder, Poller.EXISTS);
-  }
-
-  @Override
-  public void checkExists(Finder finder) {
-    Logs.call(this, "checkExists", finder);
-    getPoller().pollFor(this, finder, Poller.EXISTS);
-  }
-
-  @Override
-  public void checkGone(Finder finder) {
-    Logs.call(this, "checkGone", finder);
-    getPoller().pollFor(this, finder, Poller.GONE);
-  }
-
-  @Override
-  public Poller getPoller() {
-    return poller;
-  }
-
-  @Override
-  public void setPoller(Poller poller) {
-    this.poller = poller;
-  }
-
-  public abstract InputInjector getInjector();
-
   protected abstract E newRootElement();
 
   /**