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

Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev

Browse Source
This commit is contained in:
Brandon Keely
2012-05-25 14:38:47 -07:00
committed by Android (Google) Code Review
parent dfaadf9dae bb2a6db9e6
commit 3ef8dd2b39
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/res/res/anim-sw720dp/task_close_enter.xml
View File

@@ -23,20 +23,20 @@
<alpha android:fromAlpha="0" android:toAlpha="1.0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:startOffset="300"
android:startOffset="500"
android:duration="400"/>
<translate android:fromYDelta="-120%" android:toYDelta="0"
<translate android:fromYDelta="-50%" android:toYDelta="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quint"
android:startOffset="300"
android:startOffset="500"
android:duration="400" />
<scale android:fromXScale=".5" android:toXScale="1.0"
android:fromYScale=".5" android:toYScale="1.0"
<scale android:fromXScale=".8" android:toXScale="1.0"
android:fromYScale=".8" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="0%p"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:startOffset="300"
android:startOffset="500"
android:duration="400" />
</set>

16
core/res/res/anim-sw720dp/task_close_exit.xml
View File

@@ -23,21 +23,21 @@
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300"/>
android:duration="350"/>
<translate android:fromYDelta="0" android:toYDelta="120%"
<translate android:fromYDelta="0" android:toYDelta="50%"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_cubic"
android:duration="300"/>
android:duration="350"/>
<scale android:fromXScale="1.0" android:toXScale="0.5"
android:fromYScale="1.0" android:toYScale="0.5"
<scale android:fromXScale="1.0" android:toXScale="0.8"
android:fromYScale="1.0" android:toYScale="0.8"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:pivotX="50%p" android:pivotY="100%p"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300" />
android:duration="350" />
<!-- This is needed to keep the animation running while task_open_enter completes -->
<!-- This is needed to keep the animation running while task_close_enter completes -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:duration="700" />
android:duration="900" />
</set>

12
core/res/res/anim-sw720dp/task_open_enter.xml
View File

@@ -23,20 +23,20 @@
<alpha android:fromAlpha="0" android:toAlpha="1.0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:startOffset="300"
android:startOffset="500"
android:duration="400"/>
<translate android:fromYDelta="120%" android:toYDelta="0"
<translate android:fromYDelta="50%" android:toYDelta="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quint"
android:startOffset="300"
android:startOffset="500"
android:duration="400" />
<scale android:fromXScale=".5" android:toXScale="1.0"
android:fromYScale=".5" android:toYScale="1.0"
<scale android:fromXScale=".8" android:toXScale="1.0"
android:fromYScale=".8" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="100%p"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:startOffset="300"
android:startOffset="500"
android:duration="400" />
</set>

14
core/res/res/anim-sw720dp/task_open_exit.xml
View File

@@ -23,21 +23,21 @@
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300"/>
android:duration="350"/>
<translate android:fromYDelta="0" android:toYDelta="-120%"
<translate android:fromYDelta="0" android:toYDelta="-50%"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_cubic"
android:duration="300"/>
android:duration="350"/>
<scale android:fromXScale="1.0" android:toXScale="0.5"
android:fromYScale="1.0" android:toYScale="0.5"
<scale android:fromXScale="1.0" android:toXScale="0.8"
android:fromYScale="1.0" android:toYScale="0.8"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:pivotX="50%p" android:pivotY="0%p"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300" />
android:duration="350" />
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:duration="700" />
android:duration="900" />
</set>