commit ced67885186d9e4c401bd4a07692905d4dc691be
author Tadashi G. Takaoka <takaoka@google.com> Tue May 27 07:18:24 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 27 07:18:25 2014 +0000
tree 889f581ea7dc1a6b77eb16f1fe0497e9a275b13b
parent 6a546147ebe343fb2a75ef5b9407bbd60124650d
parent a80d55d4d374e6ca4459f975e885c2d4649c5f96

Merge "Remove compiler warning from accessibility package"

java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java

diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
index d50dd3e..27896fd 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
+++ b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
@@ -114,7 +114,7 @@
      * @param event The event to check.
      * @return {@true} is the event is a touch exploration event
      */
-    public boolean isTouchExplorationEvent(final MotionEvent event) {
+    public static boolean isTouchExplorationEvent(final MotionEvent event) {
         final int action = event.getAction();
         return action == MotionEvent.ACTION_HOVER_ENTER
                 || action == MotionEvent.ACTION_HOVER_EXIT

java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java

diff --git a/java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java b/java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java
index d6ae698..a6997e2 100644
--- a/java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java
+++ b/java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java
@@ -134,7 +134,7 @@
         event.setClassName(key.getClass().getName());
         event.setContentDescription(keyDescription);
         event.setEnabled(true);
-        final AccessibilityRecordCompat record = new AccessibilityRecordCompat(event);
+        final AccessibilityRecordCompat record = AccessibilityEventCompat.asRecord(event);
         record.setSource(mKeyboardView, virtualViewId);
         return event;
     }