Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 037be7fa authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

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

* commit '3385fe8f':
  Remove graying animation of alt-code keys while typing
parents b55f0be8 3385fe8f

java/res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

+5 −0
Original line number Diff line number Diff line
@@ -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(