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

am 3385fe8f: am 9fc82bdb: Merge "Remove graying animation of alt-code keys while typing"

Browse source 
* commit '3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32':
  Remove graying animation of alt-code keys while typing
This commit is contained in:
Tadashi G. Takaoka 2013-05-15 11:04:55 -07:00 committed by Android Git Automerger
commit 037be7fa0a
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/res/values/styles.xml
View file

@ -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>

5
java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
View file

@ -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(