nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am f99cce86: Merge "Fix checking a11y status just before calling an a11y method" 

* commit 'f99cce8615bca1ea0190ac4f5d65ee35644dd504':
  Fix checking a11y status just before calling an a11y method
main
Tadashi G. Takaoka 2014-09-25 14:21:58 +00:00 committed by Android Git Automerger
parent 4d51efce03 f99cce8615
commit 4806a94630
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
View File

@ -755,7 +755,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
public void onHideWindow() { public void onHideWindow() {
onDismissMoreKeysPanel(); onDismissMoreKeysPanel();
final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate; final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
if (accessibilityDelegate != null) { if (accessibilityDelegate != null
&& AccessibilityUtils.getInstance().isAccessibilityEnabled()) {
accessibilityDelegate.onHideWindow(); accessibilityDelegate.onHideWindow();
} }
} }
@ -766,7 +767,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
@Override @Override
public boolean onHoverEvent(final MotionEvent event) { public boolean onHoverEvent(final MotionEvent event) {
final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate; final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
if (accessibilityDelegate != null) { if (accessibilityDelegate != null
&& AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
return accessibilityDelegate.onHoverEvent(event); return accessibilityDelegate.onHoverEvent(event);
} }
return super.onHoverEvent(event); return super.onHoverEvent(event);

11
java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
View File

@ -105,7 +105,7 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel
super.setKeyboard(keyboard); super.setKeyboard(keyboard);
mKeyDetector.setKeyboard( mKeyDetector.setKeyboard(
keyboard, -getPaddingLeft(), -getPaddingTop() + getVerticalCorrection()); keyboard, -getPaddingLeft(), -getPaddingTop() + getVerticalCorrection());
if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) { if (AccessibilityUtils.getInstance().isAccessibilityEnabled()) {
if (mAccessibilityDelegate == null) { if (mAccessibilityDelegate == null) {
mAccessibilityDelegate = new MoreKeysKeyboardAccessibilityDelegate( mAccessibilityDelegate = new MoreKeysKeyboardAccessibilityDelegate(
this, mKeyDetector); this, mKeyDetector);
@ -142,7 +142,8 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel
mOriginY = y + container.getPaddingTop(); mOriginY = y + container.getPaddingTop();
controller.onShowMoreKeysPanel(this); controller.onShowMoreKeysPanel(this);
final MoreKeysKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate; final MoreKeysKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
if (accessibilityDelegate != null) { if (accessibilityDelegate != null
&& AccessibilityUtils.getInstance().isAccessibilityEnabled()) {
accessibilityDelegate.onShowMoreKeysKeyboard(); accessibilityDelegate.onShowMoreKeysKeyboard();
} }
} }
@ -239,7 +240,8 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel
return; return;
} }
final MoreKeysKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate; final MoreKeysKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
if (accessibilityDelegate != null) { if (accessibilityDelegate != null
&& AccessibilityUtils.getInstance().isAccessibilityEnabled()) {
accessibilityDelegate.onDismissMoreKeysKeyboard(); accessibilityDelegate.onDismissMoreKeysKeyboard();
} }
mController.onDismissMoreKeysPanel(); mController.onDismissMoreKeysPanel();
@ -285,7 +287,8 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel
@Override @Override
public boolean onHoverEvent(final MotionEvent event) { public boolean onHoverEvent(final MotionEvent event) {
final MoreKeysKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate; final MoreKeysKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
if (accessibilityDelegate != null) { if (accessibilityDelegate != null
&& AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
return accessibilityDelegate.onHoverEvent(event); return accessibilityDelegate.onHoverEvent(event);
} }
return super.onHoverEvent(event); return super.onHoverEvent(event);

3
java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java
View File

@ -104,7 +104,8 @@ final class EmojiPageKeyboardView extends KeyboardView implements
public boolean onHoverEvent(final MotionEvent event) { public boolean onHoverEvent(final MotionEvent event) {
final KeyboardAccessibilityDelegate<EmojiPageKeyboardView> accessibilityDelegate = final KeyboardAccessibilityDelegate<EmojiPageKeyboardView> accessibilityDelegate =
mAccessibilityDelegate; mAccessibilityDelegate;
if (accessibilityDelegate != null) { if (accessibilityDelegate != null
&& AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
return accessibilityDelegate.onHoverEvent(event); return accessibilityDelegate.onHoverEvent(event);
} }
return super.onHoverEvent(event); return super.onHoverEvent(event);

4
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
View File

@ -418,8 +418,8 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
// Decided to be in the sliding suggestion mode only when the touch point has been moved // Decided to be in the sliding suggestion mode only when the touch point has been moved
// upward. Further {@link MotionEvent}s will be delivered to // upward. Further {@link MotionEvent}s will be delivered to
// {@link #onTouchEvent(MotionEvent)}. // {@link #onTouchEvent(MotionEvent)}.
mNeedsToTransformTouchEventToHoverEvent = AccessibilityUtils.getInstance() mNeedsToTransformTouchEventToHoverEvent =
.isTouchExplorationEnabled(); AccessibilityUtils.getInstance().isTouchExplorationEnabled();
mIsDispatchingHoverEventToMoreSuggestions = false; mIsDispatchingHoverEventToMoreSuggestions = false;
return true; return true;
} }