diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-26 05:59:35 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-04-26 05:59:35 +0000 |
| commit | 9fc82bdb169f20fd0e42297dbb54e66ac87486bd (patch) | |
| tree | 146a50f0756df46dff97b3641442e54e0908ce97 /java | |
| parent | fd02ec10f0a0374096e88fa30a0e126d6ff11c72 (diff) | |
| parent | 57372fd3da2e879f190e4ccd41a00813774c9019 (diff) | |
| download | latinime-9fc82bdb169f20fd0e42297dbb54e66ac87486bd.tar.gz latinime-9fc82bdb169f20fd0e42297dbb54e66ac87486bd.tar.xz latinime-9fc82bdb169f20fd0e42297dbb54e66ac87486bd.zip | |
Merge "Remove graying animation of alt-code keys while typing"
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/styles.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/MainKeyboardView.java | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 436e080f7..dad7e2064 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -94,8 +94,10 @@ <item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item> <item name="languageOnSpacebarFinalAlpha">@integer/config_language_on_spacebar_final_alpha</item> <item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item> + <!-- Remove animations for now because it could drain a non-negligible amount of battery while typing. <item name="altCodeKeyWhileTypingFadeoutAnimator">@anim/alt_code_key_while_typing_fadeout</item> <item name="altCodeKeyWhileTypingFadeinAnimator">@anim/alt_code_key_while_typing_fadein</item> + --> <!-- Common attributes of MainKeyboardView for gesture typing detection and recognition --> <item name="gestureFloatingPreviewTextLingerTimeout">@integer/config_gesture_floating_preview_text_linger_timeout</item> <item name="gestureStaticTimeThresholdAfterFastTyping">@integer/config_gesture_static_time_threshold_after_fast_typing</item> 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( |