Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev

Browse Source
This commit is contained in:
Ari Sachter-Zeltzer
2014-10-28 08:58:21 +00:00
committed by Android (Google) Code Review
parent dd91fb4474 e7c5ed93ca
commit 20edd05327
7 changed files with 23 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/anim/activity_close_exit.xml
View File

@@ -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>

7
core/res/res/animator/fragment_close_enter.xml
View File

@@ -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"/>

19
core/res/res/animator/fragment_close_exit.xml
View File

@@ -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"/>

3
core/res/res/animator/fragment_fade_enter.xml
View File

@@ -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"

3
core/res/res/animator/fragment_fade_exit.xml
View File

@@ -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"

15
core/res/res/animator/fragment_open_enter.xml
View File

@@ -19,19 +19,8 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"> <set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator <objectAnimator
android:interpolator="@interpolator/decelerate_cubic" android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0.95" android:valueTo="1.0" android:valueFrom="0"
android:valueType="floatType" android:valueTo="1"
android:propertyName="scaleY"
android:duration="300"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0.95" android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="scaleX"
android:duration="300"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0.0" android:valueTo="1.0"
android:valueType="floatType" android:valueType="floatType"
android:propertyName="alpha" android:propertyName="alpha"
android:duration="300"/> android:duration="300"/>

3
core/res/res/animator/fragment_open_exit.xml
View File

@@ -19,7 +19,8 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"> <set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator <objectAnimator
android:interpolator="@interpolator/decelerate_cubic" android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="1.0" android:valueTo="0.0" android:valueFrom="1"
android:valueTo="0"
android:valueType="floatType" android:valueType="floatType"
android:propertyName="alpha" android:propertyName="alpha"
android:duration="300"/> android:duration="300"/>