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

Commit 9835808e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Use ObjectAnimator"

parents 9a964ed5 31c94cea

java/proguard.flags

+8 −0
Original line number Diff line number Diff line
@@ -35,6 +35,14 @@ 
  *;

}



-keep class com.android.inputmethod.keyboard.LatinKeyboardView {

  # Keep getter/setter methods for ObjectAnimator

  int getLanguageOnSpacebarAnimAlpha();

  void setLanguageOnSpacebarAnimAlpha(int);

  int getAltCodeKeyWhileTypingAnimAlhpa();

  void setAltCodeKeyWhileTypingAnimAlpha(int);

}



-keep class com.android.inputmethod.keyboard.MoreKeysKeyboard$Builder$MoreKeysKeyboardParams {

  <init>(...);

}

java/res/anim/alt_code_key_while_typing_fadein.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
*/

-->



<animator

<objectAnimator

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:propertyName="altCodeKeyWhileTypingAnimAlpha"

    android:valueType="intType"

    android:duration="100"

    android:valueFrom="128"

java/res/anim/alt_code_key_while_typing_fadeout.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
*/

-->



<animator

<objectAnimator

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:propertyName="altCodeKeyWhileTypingAnimAlpha"

    android:valueType="intType"

    android:duration="70"

    android:valueFrom="255"

java/res/anim/language_on_spacebar_fadeout.xml

+3 −2
Original line number Diff line number Diff line
@@ -18,10 +18,11 @@ 
*/

-->



<animator

<objectAnimator

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:propertyName="languageOnSpacebarAnimAlpha"

    android:valueType="intType"

    android:startOffset="1200"

    android:duration="200"

    android:valueFrom="255"

    android:valueTo="128" />
 
    android:valueTo="@integer/config_language_on_spacebar_final_alpha" />

java/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ 
        <attr name="spacebarTextColor" format="color" />

        <attr name="spacebarTextShadowColor" format="color" />

        <!-- Fadeout animator for spacebar language label. -->

        <attr name="languageOnSpacebarFinalAlpha" format="integer" />

        <attr name="languageOnSpacebarFadeoutAnimator" format="reference" />

        <!-- Fadeout and fadein animator for altCodeWhileTyping keys. -->

        <attr name="altCodeKeyWhileTypingFadeoutAnimator" format="reference" />