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

Commit e7c5ed93 authored by Ari Sachter-Zeltzer's avatar Ari Sachter-Zeltzer
Browse files

fixed jank on activity close exit with better alpha interpolation 

remove zoom animation from fragment close and open transitions. they are now just cross fades
remove zAdjustment property from animatorSet

Change-Id: I8425f745da2d93948ba8b6fc12c80b3d82c6213c
parent 42e96769

core/res/res/anim/activity_close_exit.xml

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

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

        android:shareInterpolator="false" android:zAdjustment="top">

        android:shareInterpolator="false" android:zAdjustment="top">

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

            android:interpolator="@interpolator/accelerate_quart"

            android:interpolator="@interpolator/linear"

            android:fillEnabled="true"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="true"

            android:fillBefore="false" android:fillAfter="true"

            android:startOffset="100"

            android:startOffset="100"

            android:duration="150"/>

            android:duration="150"/>

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

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

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/accelerate_quint"

            android:interpolator="@interpolator/accelerate_quart"

            android:duration="250"/>

            android:duration="250"/>

</set>
 
</set>
 
 No newline at end of file

core/res/res/animator/fragment_close_enter.xml

+6 −5
Original line number Original line Diff line number Diff line
@@ -16,10 +16,11 @@ 
** limitations under the License.

** limitations under the License.

*/

*/

-->

-->

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

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

    <objectAnimator

    <objectAnimator

        android:interpolator="@interpolator/decelerate_quad"

        android:interpolator="@interpolator/decelerate_cubic"

        android:valueFrom="0.0" android:valueTo="1.0"

        android:valueFrom="0"

        android:valueTo="1"

        android:valueType="floatType"

        android:valueType="floatType"

        android:propertyName="alpha"

        android:propertyName="alpha"

        android:duration="300"/>

        android:duration="300"/>

core/res/res/animator/fragment_close_exit.xml

+5 −16
Original line number Original line Diff line number Diff line
@@ -16,22 +16,11 @@ 
** limitations under the License.

** limitations under the License.

*/

*/

-->

-->

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

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

    <objectAnimator

    <objectAnimator

        android:interpolator="@interpolator/decelerate_quad"

        android:interpolator="@interpolator/decelerate_cubic"

        android:valueFrom="1.0" android:valueTo="0.8"

        android:valueFrom="1"

        android:valueType="floatType"

        android:valueTo="0"

        android:propertyName="scaleY"

        android:duration="300"/>

    <objectAnimator

        android:interpolator="@interpolator/decelerate_quad"

        android:valueFrom="1.0" android:valueTo="0.8"

        android:valueType="floatType"

        android:propertyName="scaleX"

        android:duration="300"/>

    <objectAnimator

        android:interpolator="@interpolator/decelerate_quad"

        android:valueFrom="1.0" android:valueTo="0.0"

        android:valueType="floatType"

        android:valueType="floatType"

        android:propertyName="alpha"

        android:propertyName="alpha"

        android:duration="300"/>

        android:duration="300"/>

core/res/res/animator/fragment_fade_enter.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,7 @@ 
** limitations under the License.

** limitations under the License.

*/

*/

-->

-->

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

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

	android:zAdjustment="top">

    <objectAnimator

    <objectAnimator

        android:interpolator="@interpolator/decelerate_cubic"

        android:interpolator="@interpolator/decelerate_cubic"

        android:valueFrom="0"

        android:valueFrom="0"

core/res/res/animator/fragment_fade_exit.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,7 @@ 
** limitations under the License.

** limitations under the License.

*/

*/

-->

-->

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

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

	android:zAdjustment="normal">

    <objectAnimator

    <objectAnimator

        android:interpolator="@interpolator/decelerate_cubic"

        android:interpolator="@interpolator/decelerate_cubic"

        android:valueFrom="1"

        android:valueFrom="1"