Merge "Fix checking a11y status just before calling an a11y method" (f99cce86) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -755,7 +755,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();
		}
		}
		@@ -766,7 +767,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);

java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java

+7 −4

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

java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java

+2 −1

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

java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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
		// upward. Further {@link MotionEvent}s will be delivered to
		// {@link #onTouchEvent(MotionEvent)}.
		mNeedsToTransformTouchEventToHoverEvent = AccessibilityUtils.getInstance()
		.isTouchExplorationEnabled();
		mNeedsToTransformTouchEventToHoverEvent =
		AccessibilityUtils.getInstance().isTouchExplorationEnabled();
		mIsDispatchingHoverEventToMoreSuggestions = false;
		return true;
		}