diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-05-15 11:04:55 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 11:04:55 -0700 |
| commit | 037be7fa0a50b7c4bfc1368b9e9e158473f2e3b5 (patch) | |
| tree | 1fc7374a42e09284ccaf28d702914d728ea0edbf /java/src/com | |
| parent | b55f0be85c51d07c6e64d8fc59279349045e52aa (diff) | |
| parent | 3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32 (diff) | |
| download | latinime-037be7fa0a50b7c4bfc1368b9e9e158473f2e3b5.tar.gz latinime-037be7fa0a50b7c4bfc1368b9e9e158473f2e3b5.tar.xz latinime-037be7fa0a50b7c4bfc1368b9e9e158473f2e3b5.zip | |
am 3385fe8f: am 9fc82bdb: Merge "Remove graying animation of alt-code keys while typing"
* commit '3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32':
Remove graying animation of alt-code keys while typing
Diffstat (limited to 'java/src/com')
| -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( |