diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2014-09-24 14:56:37 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-10-14 01:40:27 +0000 |
| commit | ae3ad8ebdd1a3239e17fd14e50a8e9670cb5b61a (patch) | |
| tree | a7b4818eabf6caec501b8f943f329da78ea8bed8 /java/src/com/android/inputmethod/keyboard/MainKeyboardView.java | |
| parent | d218ba4b518b38ee2ab144e16c9b60a91eacdf95 (diff) | |
(DO NOT MERGE) Fix checking a11y status just before calling an a11y method
Cherry picked from Master, commit 04cd8794e04b14c2b7e7eed036b83075792134a1
Bug: 17035860
Change-Id: I9627d525a570ced085281b4db93fe6896081e818
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/MainKeyboardView.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/MainKeyboardView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java index 6d0b2c2f1..2b16785c2 100644 --- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java @@ -756,7 +756,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack public void onHideWindow() { onDismissMoreKeysPanel(); final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate; - if (accessibilityDelegate != null) { + if (accessibilityDelegate != null + && AccessibilityUtils.getInstance().isAccessibilityEnabled()) { accessibilityDelegate.onHideWindow(); } } @@ -767,7 +768,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack @Override public boolean onHoverEvent(final MotionEvent event) { final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate; - if (accessibilityDelegate != null) { + if (accessibilityDelegate != null + && AccessibilityUtils.getInstance().isTouchExplorationEnabled()) { return accessibilityDelegate.onHoverEvent(event); } return super.onHoverEvent(event); |