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

am bb8f6fc4: am d4777552: Merge "Fix graying animation of alt-code keys when space/enter is typed" 

* commit 'bb8f6fc4c755ed1a3a1b433fac34c4f9fdd694dc':
  Fix graying animation of alt-code keys when space/enter is typed
main
Tadashi G. Takaoka 2013-05-15 11:05:14 -07:00 committed by Android Git Automerger
parent e7c5c8f6fd bb8f6fc4c7
commit 3983196461
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,7 +370,9 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
// When user hits the space or the enter key, just cancel the while-typing timer.
final int typedCode = typedKey.mCode;
if (typedCode == Constants.CODE_SPACE || typedCode == Constants.CODE_ENTER) {
startWhileTypingFadeinAnimation(keyboardView);
if (isTyping) {
startWhileTypingFadeinAnimation(keyboardView);
}
return;
}
@ -614,8 +616,18 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
@ExternallyReferenced
public void setAltCodeKeyWhileTypingAnimAlpha(final int alpha) {
if (mAltCodeKeyWhileTypingAnimAlpha == alpha) {
return;
}
// Update the visual of alt-code-key-while-typing.
mAltCodeKeyWhileTypingAnimAlpha = alpha;
updateAltCodeKeyWhileTyping();
final Keyboard keyboard = getKeyboard();
if (keyboard == null) {
return;
}
for (final Key key : keyboard.mAltCodeKeysWhileTyping) {
invalidateKey(key);
}
}
public void setKeyboardActionListener(final KeyboardActionListener listener) {
@ -1282,16 +1294,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
invalidateKey(shortcutKey);
}
private void updateAltCodeKeyWhileTyping() {
final Keyboard keyboard = getKeyboard();
if (keyboard == null) {
return;
}
for (final Key key : keyboard.mAltCodeKeysWhileTyping) {
invalidateKey(key);
}
}
public void startDisplayLanguageOnSpacebar(final boolean subtypeChanged,
final boolean needsToDisplayLanguage, final boolean hasMultipleEnabledIMEsOrSubtypes) {
mNeedsToDisplayLanguage = needsToDisplayLanguage;