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

Revert "Pass hover event to accessibility key handling methods"

Browse source 
It turns out passing hover event to accessibility key handling methods
isn't necessary. This parically reverts I1f7feef707.

Bug: 12491371
Change-Id: I9d71cd29723344433427795e44cb22ac41faace6
This commit is contained in:
Tadashi G. Takaoka 2014-06-04 03:09:30 +00:00
parent 2660b70f80
commit 2c35f3bdd5
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityDelegate.java
View file

@ -181,7 +181,7 @@ public class KeyboardAccessibilityDelegate<KV extends KeyboardView>
protected void onHoverEnter(final MotionEvent event) { protected void onHoverEnter(final MotionEvent event) {
final Key key = getHoverKeyOf(event); final Key key = getHoverKeyOf(event);
if (key != null) { if (key != null) {
onHoverEnterKey(key, event); onHoverEnterKey(key);
} }
setLastHoverKey(key); setLastHoverKey(key);
} }
@ -196,14 +196,14 @@ public class KeyboardAccessibilityDelegate<KV extends KeyboardView>
final Key key = getHoverKeyOf(event); final Key key = getHoverKeyOf(event);
if (key != lastKey) { if (key != lastKey) {
if (lastKey != null) { if (lastKey != null) {
onHoverExitKey(lastKey, event); onHoverExitKey(lastKey);
} }
if (key != null) { if (key != null) {
onHoverEnterKey(key, event); onHoverEnterKey(key);
} }
} }
if (key != null) { if (key != null) {
onHoverMoveKey(key, event); onHoverMoveKey(key);
} }
setLastHoverKey(key); setLastHoverKey(key);
} }
@ -216,7 +216,7 @@ public class KeyboardAccessibilityDelegate<KV extends KeyboardView>
protected void onHoverExit(final MotionEvent event) { protected void onHoverExit(final MotionEvent event) {
final Key lastKey = getLastHoverKey(); final Key lastKey = getLastHoverKey();
if (lastKey != null) { if (lastKey != null) {
onHoverExitKey(lastKey, event); onHoverExitKey(lastKey);
} }
final Key key = getHoverKeyOf(event); final Key key = getHoverKeyOf(event);
// Make sure we're not getting an EXIT event because the user slid // Make sure we're not getting an EXIT event because the user slid
@ -224,7 +224,7 @@ public class KeyboardAccessibilityDelegate<KV extends KeyboardView>
if (key != null) { if (key != null) {
simulateTouchEvent(MotionEvent.ACTION_DOWN, event); simulateTouchEvent(MotionEvent.ACTION_DOWN, event);
simulateTouchEvent(MotionEvent.ACTION_UP, event); simulateTouchEvent(MotionEvent.ACTION_UP, event);
onHoverExitKey(key, event); onHoverExitKey(key);
} }
setLastHoverKey(null); setLastHoverKey(null);
} }
@ -263,9 +263,8 @@ public class KeyboardAccessibilityDelegate<KV extends KeyboardView>
* Handles a hover enter event on a key. * Handles a hover enter event on a key.
* *
* @param key The currently hovered key. * @param key The currently hovered key.
* @param event The hover event that triggers a call to this method.
*/ */
protected void onHoverEnterKey(final Key key, final MotionEvent event) { protected void onHoverEnterKey(final Key key) {
key.onPressed(); key.onPressed();
mKeyboardView.invalidateKey(key); mKeyboardView.invalidateKey(key);
final KeyboardAccessibilityNodeProvider provider = getAccessibilityNodeProvider(); final KeyboardAccessibilityNodeProvider provider = getAccessibilityNodeProvider();
@ -277,17 +276,15 @@ public class KeyboardAccessibilityDelegate<KV extends KeyboardView>
* Handles a hover move event on a key. * Handles a hover move event on a key.
* *
* @param key The currently hovered key. * @param key The currently hovered key.
* @param event The hover event that triggers a call to this method.
*/ */
protected void onHoverMoveKey(final Key key, final MotionEvent event) { } protected void onHoverMoveKey(final Key key) { }
/** /**
* Handles a hover exit event on a key. * Handles a hover exit event on a key.
* *
* @param key The currently hovered key. * @param key The currently hovered key.
* @param event The hover event that triggers a call to this method.
*/ */
protected void onHoverExitKey(final Key key, final MotionEvent event) { protected void onHoverExitKey(final Key key) {
key.onReleased(); key.onReleased();
mKeyboardView.invalidateKey(key); mKeyboardView.invalidateKey(key);
final KeyboardAccessibilityNodeProvider provider = getAccessibilityNodeProvider(); final KeyboardAccessibilityNodeProvider provider = getAccessibilityNodeProvider();