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

Merge "Wallpaper transition changed to fade instead of translate/scale/fade."

Browse Source
This commit is contained in:
Amith Yamasani
2010-10-27 14:02:08 -07:00
committed by Android (Google) Code Review
parent 091511b41b 21b4b04f6d
commit 367c6c7bb8
4 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/res/anim/wallpaper_intra_close_enter.xml
View File

@@ -20,12 +20,6 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@anim/decelerate_interpolator"
android:zAdjustment="top">
<scale android:fromXScale="2.0" android:toXScale="1.0"
android:fromYScale="2.0" android:toYScale="1.0"
android:pivotX="100%p" android:pivotY="50%p"
android:duration="@android:integer/config_mediumAnimTime" />
<translate android:fromXDelta="-150%p" android:toXDelta="0%p"
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha android:fromAlpha="0.5" android:toAlpha="1.0"
android:duration="@android:integer/config_shortAnimTime" />
</set>

12
core/res/res/anim/wallpaper_intra_close_exit.xml
View File

@@ -18,13 +18,7 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@anim/accelerate_interpolator">
<scale android:fromXScale="1.0" android:toXScale=".5"
android:fromYScale="1.0" android:toYScale=".5"
android:pivotX="100%p" android:pivotY="50%p"
android:duration="@android:integer/config_mediumAnimTime" />
<translate android:fromXDelta="0%p" android:toXDelta="100%p"
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_mediumAnimTime"/>
android:interpolator="@anim/decelerate_interpolator">
<alpha android:fromAlpha="0.5" android:toAlpha="0.0"
android:duration="@android:integer/config_shortAnimTime"/>
</set>

10
core/res/res/anim/wallpaper_intra_open_enter.xml
View File

@@ -19,12 +19,6 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@anim/decelerate_interpolator">
<scale android:fromXScale=".5" android:toXScale="1.0"
android:fromYScale=".5" android:toYScale="1.0"
android:pivotX="100%p" android:pivotY="50%p"
android:duration="@android:integer/config_mediumAnimTime" />
<translate android:fromXDelta="100%p" android:toXDelta="0"
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha android:fromAlpha="0.5" android:toAlpha="1.0"
android:duration="@android:integer/config_shortAnimTime" />
</set>

12
core/res/res/anim/wallpaper_intra_open_exit.xml
View File

@@ -18,14 +18,8 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@anim/accelerate_interpolator"
android:interpolator="@anim/decelerate_interpolator"
android:zAdjustment="top">
<scale android:fromXScale="1.0" android:toXScale="2.0"
android:fromYScale="1.0" android:toYScale="2.0"
android:pivotX="100%p" android:pivotY="50%p"
android:duration="@android:integer/config_mediumAnimTime" />
<translate android:fromXDelta="0" android:toXDelta="-150%p"
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="0.5" android:toAlpha="0.0"
android:duration="@android:integer/config_shortAnimTime"/>
</set>