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

Commit 02e192f6 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

am 80c23e3c: am e672db28: am ed097689: Merge "Add animations for the system... 

am 80c23e3c: am e672db28: am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev

* commit '80c23e3c':
  Add animations for the system bar color views
parents 88c1e8c3 80c23e3c

core/res/res/anim/dock_bottom_enter.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,5 +20,5 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

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

        android:interpolator="@android:interpolator/decelerate_cubic">

        android:interpolator="@android:interpolator/decelerate_cubic">

    <translate android:fromYDelta="100%" android:toYDelta="0"

    <translate android:fromYDelta="100%" android:toYDelta="0"

        android:duration="250"/>

        android:duration="@integer/dock_enter_exit_duration"/>

</set>
 
</set>

core/res/res/anim/dock_bottom_exit.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,5 +20,5 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

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

        android:interpolator="@android:interpolator/accelerate_cubic">

        android:interpolator="@android:interpolator/accelerate_cubic">

    <translate android:fromYDelta="0" android:toYDelta="100%"

    <translate android:fromYDelta="0" android:toYDelta="100%"

        android:startOffset="100" android:duration="250"/>

        android:startOffset="100" android:duration="@integer/dock_enter_exit_duration"/>

</set>
 
</set>

core/res/res/anim/dock_top_enter.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,5 +20,5 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

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

        android:interpolator="@android:interpolator/decelerate_cubic">

        android:interpolator="@android:interpolator/decelerate_cubic">

    <translate android:fromYDelta="-100%" android:toYDelta="0"

    <translate android:fromYDelta="-100%" android:toYDelta="0"

        android:duration="250"/>

        android:duration="@integer/dock_enter_exit_duration"/>

</set>
 
</set>

core/res/res/anim/dock_top_exit.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,5 +20,5 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

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

        android:interpolator="@android:interpolator/accelerate_cubic">

        android:interpolator="@android:interpolator/accelerate_cubic">

    <translate android:fromYDelta="0" android:toYDelta="-100%"

    <translate android:fromYDelta="0" android:toYDelta="-100%"

        android:startOffset="100" android:duration="250"/>

        android:startOffset="100" android:duration="@integer/dock_enter_exit_duration"/>

</set>
 
</set>

core/res/res/values/integers.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,4 +22,5 @@ 
    <integer name="button_pressed_animation_duration">100</integer>

    <integer name="button_pressed_animation_duration">100</integer>

    <integer name="button_pressed_animation_delay">100</integer>

    <integer name="button_pressed_animation_delay">100</integer>

    <integer name="disabled_alpha_animation_duration">100</integer>

    <integer name="disabled_alpha_animation_duration">100</integer>

    <integer name="dock_enter_exit_duration">250</integer>

</resources>
 
</resources>