log DroidDriver.find and Events.touchMove at VERBOSE level

set API version to 19 instead of current

Change-Id: I526cd3c16c37faeed1c4d400d887b2bd9edf0b9f

5 files changed, 19 insertions, 10 deletions

diff --git a/src/com/google/android/droiddriver/base/BaseDroidDriver.java b/src/com/google/android/droiddriver/base/BaseDroidDriver.java
index b881b91..1bd0a33 100644
--- a/src/com/google/android/droiddriver/base/BaseDroidDriver.java
+++ b/src/com/google/android/droiddriver/base/BaseDroidDriver.java
@@ -16,6 +16,8 @@
 
 package com.google.android.droiddriver.base;
 
+import android.util.Log;
+
 import com.google.android.droiddriver.DroidDriver;
 import com.google.android.droiddriver.Poller;
 import com.google.android.droiddriver.UiElement;
@@ -36,7 +38,7 @@ public abstract class BaseDroidDriver<R, E extends BaseUiElement<R, E>> implemen
 
   @Override
   public UiElement find(Finder finder) {
-    Logs.call(this, "find", finder);
+    Logs.call(Log.VERBOSE, this, "find", finder);
     return finder.find(getRootElement());
   }
 
diff --git a/src/com/google/android/droiddriver/base/BaseUiDevice.java b/src/com/google/android/droiddriver/base/BaseUiDevice.java
index e9c6426..a48e410 100644
--- a/src/com/google/android/droiddriver/base/BaseUiDevice.java
+++ b/src/com/google/android/droiddriver/base/BaseUiDevice.java
@@ -42,7 +42,6 @@ public abstract class BaseUiDevice implements UiDevice {
   private static final SingleKeyAction POWER_ON = new SingleKeyAction(KeyEvent.KEYCODE_POWER,
       1000L, false);
 
-  @SuppressWarnings("deprecation")
   @Override
   public boolean isScreenOn() {
     PowerManager pm =
diff --git a/src/com/google/android/droiddriver/finders/Predicates.java b/src/com/google/android/droiddriver/finders/Predicates.java
index 36d2fa3..3e4ce3c 100644
--- a/src/com/google/android/droiddriver/finders/Predicates.java
+++ b/src/com/google/android/droiddriver/finders/Predicates.java
@@ -97,8 +97,8 @@ public final class Predicates {
    * order, and evaluation will be "short-circuited" as soon as a false
    * predicate is found.
    */
-  public static <T> Predicate<T> allOf(
-      @SuppressWarnings("unchecked") final Predicate<? super T>... components) {
+  @SuppressWarnings("unchecked")
+  public static <T> Predicate<T> allOf(final Predicate<? super T>... components) {
     return new Predicate<T>() {
       @Override
       public boolean apply(T input) {
@@ -123,8 +123,8 @@ public final class Predicates {
    * order, and evaluation will be "short-circuited" as soon as a true predicate
    * is found.
    */
-  public static <T> Predicate<T> anyOf(
-      @SuppressWarnings("unchecked") final Predicate<? super T>... components) {
+  @SuppressWarnings("unchecked")
+  public static <T> Predicate<T> anyOf(final Predicate<? super T>... components) {
     return new Predicate<T>() {
       @Override
       public boolean apply(T input) {
diff --git a/src/com/google/android/droiddriver/util/Events.java b/src/com/google/android/droiddriver/util/Events.java
index 5268780..cc43ec2 100644
--- a/src/com/google/android/droiddriver/util/Events.java
+++ b/src/com/google/android/droiddriver/util/Events.java
@@ -17,6 +17,7 @@
 package com.google.android.droiddriver.util;
 
 import android.os.SystemClock;
+import android.util.Log;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -71,7 +72,11 @@ public class Events {
    * @throws ActionException if injection failed
    */
   public static void injectEvent(InputInjector injector, MotionEvent event) {
-    Logs.call(injector, "injectInputEvent", event);
+    injectEvent(Log.DEBUG, injector, event);
+  }
+
+  public static void injectEvent(int priority, InputInjector injector, MotionEvent event) {
+    Logs.call(priority, injector, "injectInputEvent", event);
     try {
       if (!injector.injectInputEvent(event)) {
         throw new ActionException("Failed to inject " + event);
@@ -93,7 +98,7 @@ public class Events {
   }
 
   public static void touchMove(InputInjector injector, long downTime, int x, int y) {
-    injectEvent(injector, newTouchMoveEvent(downTime, x, y));
+    injectEvent(Log.VERBOSE, injector, newTouchMoveEvent(downTime, x, y));
   }
 
   private Events() {}
diff --git a/src/com/google/android/droiddriver/util/Logs.java b/src/com/google/android/droiddriver/util/Logs.java
index e08ee10..3491b96 100644
--- a/src/com/google/android/droiddriver/util/Logs.java
+++ b/src/com/google/android/droiddriver/util/Logs.java
@@ -24,10 +24,13 @@ import android.util.Log;
  */
 public class Logs {
   public static final String TAG = "DroidDriver";
-  public static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
   public static void call(Object self, String method, Object... args) {
-    if (DEBUG) {
+    call(Log.DEBUG, self, method, args);
+  }
+
+  public static void call(int priority, Object self, String method, Object... args) {
+    if (Log.isLoggable(TAG, priority)) {
       Log.d(
           TAG,
           String.format("Invoking %s.%s(%s)", self.getClass().getSimpleName(), method,