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

Commit 8fe044a3 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Adjust window animations to better match UX spec. 

This introduces new resources for interpolators that match the
types received from UX, and uses them appropriately in the animations.

Change-Id: I68c435ff1c8845c7854fa78f24e33157659b16d1
parent 55ea91f2

api/current.xml

+45 −1
Original line number Diff line number Diff line
@@ -1482,6 +1482,17 @@ 
 visibility="public"

>

</constructor>

<field name="accelerate_cubic_interpolator"

 type="int"

 transient="false"

 volatile="false"

 value="17432591"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="accelerate_decelerate_interpolator"

 type="int"

 transient="false"
@@ -1504,6 +1515,17 @@ 
 visibility="public"

>

</field>

<field name="accelerate_quint_interpolator"

 type="int"

 transient="false"

 volatile="false"

 value="17432593"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="animator_fade_in"

 type="int"

 transient="false"
@@ -1570,6 +1592,17 @@ 
 visibility="public"

>

</field>

<field name="decelerate_cubic_interpolator"

 type="int"

 transient="false"

 volatile="false"

 value="17432592"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="decelerate_interpolator"

 type="int"

 transient="false"
@@ -1581,6 +1614,17 @@ 
 visibility="public"

>

</field>

<field name="decelerate_quint_interpolator"

 type="int"

 transient="false"

 volatile="false"

 value="17432594"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="fade_in"

 type="int"

 transient="false"
@@ -245869,7 +245913,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/res/res/anim/accelerate_cubic_interpolator.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/res/anim/ease_in_interpolator.xml

**

** Copyright 2010, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License"); 

** you may not use this file except in compliance with the License. 

** You may obtain a copy of the License at 

**

**     http://www.apache.org/licenses/LICENSE-2.0 

**

** Unless required by applicable law or agreed to in writing, software 

** distributed under the License is distributed on an "AS IS" BASIS, 

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

** See the License for the specific language governing permissions and 

** limitations under the License.

*/

-->



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

        android:factor="1.5" />

core/res/res/anim/accelerate_quint_interpolator.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/res/anim/ease_in_interpolator.xml

**

** Copyright 2010, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License"); 

** you may not use this file except in compliance with the License. 

** You may obtain a copy of the License at 

**

**     http://www.apache.org/licenses/LICENSE-2.0 

**

** Unless required by applicable law or agreed to in writing, software 

** distributed under the License is distributed on an "AS IS" BASIS, 

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

** See the License for the specific language governing permissions and 

** limitations under the License.

*/

-->



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

        android:factor="2.5" />

core/res/res/anim/activity_close_enter.xml

+1 −3
Original line number Diff line number Diff line
@@ -17,10 +17,8 @@ 
*/

-->



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

        android:interpolator="@anim/decelerate_interpolator">

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

    <!-- Do nothing. -->

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

            android:interpolator="@anim/decelerate_interpolator"

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

</set>

core/res/res/anim/activity_close_exit.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
*/

-->



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

        android:interpolator="@anim/decelerate_interpolator">

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

    <scale android:fromXScale="1.0" android:toXScale="1.0"

            android:fromYScale="1.0" android:toYScale="0.9"

            android:pivotX="50%p" android:pivotY="50%p"

            android:interpolator="@anim/decelerate_quint_interpolator"

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

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

            android:interpolator="@anim/decelerate_interpolator"

            android:interpolator="@anim/decelerate_cubic_interpolator"

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

</set>