am ced67885: Merge "Remove compiler warning from accessibility package"

* commit 'ced67885186d9e4c401bd4a07692905d4dc691be':
  Remove compiler warning from accessibility package
main
Tadashi G. Takaoka 2014-05-27 07:21:08 +00:00 committed by Android Git Automerger
commit 330c10bec4
2 changed files with 2 additions and 2 deletions

View File

@ -114,7 +114,7 @@ public final class AccessibilityUtils {
* @param event The event to check. * @param event The event to check.
* @return {@true} is the event is a touch exploration event * @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(); final int action = event.getAction();
return action == MotionEvent.ACTION_HOVER_ENTER return action == MotionEvent.ACTION_HOVER_ENTER
|| action == MotionEvent.ACTION_HOVER_EXIT || action == MotionEvent.ACTION_HOVER_EXIT

View File

@ -134,7 +134,7 @@ public final class KeyboardAccessibilityNodeProvider extends AccessibilityNodePr
event.setClassName(key.getClass().getName()); event.setClassName(key.getClass().getName());
event.setContentDescription(keyDescription); event.setContentDescription(keyDescription);
event.setEnabled(true); event.setEnabled(true);
final AccessibilityRecordCompat record = new AccessibilityRecordCompat(event); final AccessibilityRecordCompat record = AccessibilityEventCompat.asRecord(event);
record.setSource(mKeyboardView, virtualViewId); record.setSource(mKeyboardView, virtualViewId);
return event; return event;
} }