diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-25 23:02:06 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-25 23:02:06 -0700 |
| commit | 3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32 (patch) | |
| tree | 146a50f0756df46dff97b3641442e54e0908ce97 /java/src/com/android/inputmethod | |
| parent | 17fce9e3455c9fbc88f6eabf220165abdaaee417 (diff) | |
| parent | 9fc82bdb169f20fd0e42297dbb54e66ac87486bd (diff) | |
| download | latinime-3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32.tar.gz latinime-3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32.tar.xz latinime-3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32.zip | |
am 9fc82bdb: Merge "Remove graying animation of alt-code keys while typing"
* commit '9fc82bdb169f20fd0e42297dbb54e66ac87486bd':
Remove graying animation of alt-code keys while typing
Diffstat (limited to 'java/src/com/android/inputmethod')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/MainKeyboardView.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java index 454469ce7..8d4beeced 100644 --- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java @@ -333,6 +333,10 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack private static void cancelAndStartAnimators(final ObjectAnimator animatorToCancel, final ObjectAnimator animatorToStart) { + if (animatorToCancel == null || animatorToStart == null) { + // TODO: Stop using null as a no-operation animator. + return; + } float startFraction = 0.0f; if (animatorToCancel.isStarted()) { animatorToCancel.cancel(); @@ -581,6 +585,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack private ObjectAnimator loadObjectAnimator(final int resId, final Object target) { if (resId == 0) { + // TODO: Stop returning null. return null; } final ObjectAnimator animator = (ObjectAnimator)AnimatorInflater.loadAnimator( |