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

am af1c1b3b: Merge "softening app-to-home and task-to-task transitions" into jb-dev

Browse Source 
* commit 'af1c1b3b1304f83570253f78666f8e8c77eef95d':
  softening app-to-home and task-to-task transitions
This commit is contained in:
Brandon Keely
2012-05-16 17:03:44 -07:00
committed by Android Git Automerger
parent dd684eb3e0 af1c1b3b13
commit 6e1cedc9b6
14 changed files with 137 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/res/res/anim-land/task_close_enter.xml
View File

@@ -23,21 +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="150"
android:duration="350"/>
android:startOffset="300"
android:duration="400"/>
<translate android:fromXDelta="-140%" android:toXDelta="0"
<translate android:fromXDelta="-120%" android:toXDelta="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_cubic"
android:startOffset="150"
android:duration="350"/>
android:interpolator="@interpolator/decelerate_quint"
android:startOffset="300"
android:duration="400" />
<scale android:fromXScale=".6" android:toXScale="1.0"
android:fromYScale=".6" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
<scale android:fromXScale=".5" android:toXScale="1.0"
android:fromYScale=".5" android:toYScale="1.0"
android:pivotY="50%p" android:pivotX="0%p"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:startOffset="150"
android:duration="350" />
android:startOffset="300"
android:duration="400" />
</set>

22
core/res/res/anim-land/task_close_exit.xml
View File

@@ -19,25 +19,25 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="350"/>
android:duration="300"/>
<translate android:fromXDelta="0" android:toXDelta="140%"
<translate android:fromXDelta="0" android:toXDelta="120%"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:duration="350"/>
android:interpolator="@interpolator/accelerate_cubic"
android:duration="300"/>
<scale android:fromXScale="1.0" android:toXScale="0.6"
android:fromYScale="1.0" android:toYScale="0.6"
<scale android:fromXScale="1.0" android:toXScale="0.5"
android:fromYScale="1.0" android:toYScale="0.5"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@interpolator/decelerate_cubic"
android:duration="350" />
android:pivotY="50%p" android:pivotX="100%p"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300" />
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:interpolator="@interpolator/accelerate_quad"
android:duration="500" />
android:duration="700" />
</set>

23
core/res/res/anim-land/task_open_enter.xml
View File

@@ -23,21 +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="150"
android:duration="350"/>
android:startOffset="300"
android:duration="400"/>
<translate android:fromXDelta="140%" android:toXDelta="0"
<translate android:fromXDelta="120%" android:toXDelta="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_cubic"
android:startOffset="150"
android:duration="350"/>
android:interpolator="@interpolator/decelerate_quint"
android:startOffset="300"
android:duration="400" />
<scale android:fromXScale=".6" android:toXScale="1.0"
android:fromYScale=".6" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
<scale android:fromXScale=".5" android:toXScale="1.0"
android:fromYScale=".5" android:toYScale="1.0"
android:pivotY="50%p" android:pivotX="100%p"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:startOffset="150"
android:duration="350" />
android:startOffset="300"
android:duration="400" />
</set>

22
core/res/res/anim-land/task_open_exit.xml
View File

@@ -19,25 +19,25 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="350"/>
android:duration="300"/>
<translate android:fromXDelta="0" android:toXDelta="-140%"
<translate android:fromXDelta="0" android:toXDelta="-120%"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:duration="350"/>
android:interpolator="@interpolator/accelerate_cubic"
android:duration="300"/>
<scale android:fromXScale="1.0" android:toXScale="0.6"
android:fromYScale="1.0" android:toYScale="0.6"
<scale android:fromXScale="1.0" android:toXScale="0.5"
android:fromYScale="1.0" android:toYScale="0.5"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@interpolator/decelerate_cubic"
android:duration="350" />
android:pivotY="50%p" android:pivotX="0%p"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300" />
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:interpolator="@interpolator/accelerate_quad"
android:duration="500" />
android:duration="700" />
</set>

23
core/res/res/anim-port/task_close_enter.xml
View File

@@ -23,21 +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="150"
android:duration="350"/>
android:startOffset="300"
android:duration="400"/>
<translate android:fromYDelta="-140%" android:toYDelta="0"
<translate android:fromYDelta="-120%" android:toYDelta="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_cubic"
android:startOffset="150"
android:duration="350"/>
android:interpolator="@interpolator/decelerate_quint"
android:startOffset="300"
android:duration="400" />
<scale android:fromXScale=".6" android:toXScale="1.0"
android:fromYScale=".6" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
<scale android:fromXScale=".5" android:toXScale="1.0"
android:fromYScale=".5" 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="150"
android:duration="350" />
android:startOffset="300"
android:duration="400" />
</set>

22
core/res/res/anim-port/task_close_exit.xml
View File

@@ -19,25 +19,25 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="350"/>
android:duration="300"/>
<translate android:fromYDelta="0" android:toYDelta="140%"
<translate android:fromYDelta="0" android:toYDelta="120%"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:duration="350"/>
android:interpolator="@interpolator/accelerate_cubic"
android:duration="300"/>
<scale android:fromXScale="1.0" android:toXScale="0.6"
android:fromYScale="1.0" android:toYScale="0.6"
<scale android:fromXScale="1.0" android:toXScale="0.5"
android:fromYScale="1.0" android:toYScale="0.5"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@interpolator/decelerate_cubic"
android:duration="350" />
android:pivotX="50%p" android:pivotY="100%p"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300" />
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:interpolator="@interpolator/accelerate_quad"
android:duration="500" />
android:duration="700" />
</set>

23
core/res/res/anim-port/task_open_enter.xml
View File

@@ -23,21 +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="150"
android:duration="350"/>
android:startOffset="300"
android:duration="400"/>
<translate android:fromYDelta="140%" android:toYDelta="0"
<translate android:fromYDelta="120%" android:toYDelta="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_cubic"
android:startOffset="150"
android:duration="350"/>
android:interpolator="@interpolator/decelerate_quint"
android:startOffset="300"
android:duration="400" />
<scale android:fromXScale=".6" android:toXScale="1.0"
android:fromYScale=".6" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
<scale android:fromXScale=".5" android:toXScale="1.0"
android:fromYScale=".5" 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="150"
android:duration="350" />
android:startOffset="300"
android:duration="400" />
</set>

22
core/res/res/anim-port/task_open_exit.xml
View File

@@ -19,25 +19,25 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="350"/>
android:duration="300"/>
<translate android:fromYDelta="0" android:toYDelta="-140%"
<translate android:fromYDelta="0" android:toYDelta="-120%"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:duration="350"/>
android:interpolator="@interpolator/accelerate_cubic"
android:duration="300"/>
<scale android:fromXScale="1.0" android:toXScale="0.6"
android:fromYScale="1.0" android:toYScale="0.6"
<scale android:fromXScale="1.0" android:toXScale="0.5"
android:fromYScale="1.0" android:toYScale="0.5"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@interpolator/decelerate_cubic"
android:duration="350" />
android:pivotX="50%p" android:pivotY="0%p"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300" />
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:interpolator="@interpolator/accelerate_quad"
android:duration="500" />
android:duration="700" />
</set>

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

@@ -23,21 +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="150"
android:duration="350"/>
android:startOffset="300"
android:duration="400"/>
<translate android:fromYDelta="-140%" android:toYDelta="0"
<translate android:fromYDelta="-120%" android:toYDelta="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_cubic"
android:startOffset="150"
android:duration="350"/>
android:interpolator="@interpolator/decelerate_quint"
android:startOffset="300"
android:duration="400" />
<scale android:fromXScale=".6" android:toXScale="1.0"
android:fromYScale=".6" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
<scale android:fromXScale=".5" android:toXScale="1.0"
android:fromYScale=".5" 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="150"
android:duration="350" />
android:startOffset="300"
android:duration="400" />
</set>

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

@@ -19,25 +19,25 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="350"/>
android:duration="300"/>
<translate android:fromYDelta="0" android:toYDelta="140%"
<translate android:fromYDelta="0" android:toYDelta="120%"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:duration="350"/>
android:interpolator="@interpolator/accelerate_cubic"
android:duration="300"/>
<scale android:fromXScale="1.0" android:toXScale="0.6"
android:fromYScale="1.0" android:toYScale="0.6"
<scale android:fromXScale="1.0" android:toXScale="0.5"
android:fromYScale="1.0" android:toYScale="0.5"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@interpolator/decelerate_cubic"
android:duration="350" />
android:pivotX="50%p" android:pivotY="100%p"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300" />
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:interpolator="@interpolator/accelerate_quad"
android:duration="500" />
android:duration="700" />
</set>

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

@@ -23,21 +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="150"
android:duration="350"/>
android:startOffset="300"
android:duration="400"/>
<translate android:fromYDelta="140%" android:toYDelta="0"
<translate android:fromYDelta="120%" android:toYDelta="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_cubic"
android:startOffset="150"
android:duration="350"/>
android:interpolator="@interpolator/decelerate_quint"
android:startOffset="300"
android:duration="400" />
<scale android:fromXScale=".6" android:toXScale="1.0"
android:fromYScale=".6" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
<scale android:fromXScale=".5" android:toXScale="1.0"
android:fromYScale=".5" 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="150"
android:duration="350" />
android:startOffset="300"
android:duration="400" />
</set>

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

@@ -19,25 +19,25 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/accelerate_quad"
android:duration="350"/>
android:duration="300"/>
<translate android:fromYDelta="0" android:toYDelta="-140%"
<translate android:fromYDelta="0" android:toYDelta="-120%"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/decelerate_quad"
android:duration="350"/>
android:interpolator="@interpolator/accelerate_cubic"
android:duration="300"/>
<scale android:fromXScale="1.0" android:toXScale="0.6"
android:fromYScale="1.0" android:toYScale="0.6"
<scale android:fromXScale="1.0" android:toXScale="0.5"
android:fromYScale="1.0" android:toYScale="0.5"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@interpolator/decelerate_cubic"
android:duration="350" />
android:pivotX="50%p" android:pivotY="0%p"
android:interpolator="@interpolator/accelerate_quad"
android:duration="300" />
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:interpolator="@interpolator/accelerate_quad"
android:duration="500" />
android:duration="700" />
</set>

2
core/res/res/anim/wallpaper_open_enter.xml
View File

@@ -21,5 +21,5 @@
android:detachWallpaper="true" android:shareInterpolator="false" android:zAdjustment="normal">
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:duration="300"/>
android:duration="375"/>
</set>

8
core/res/res/anim/wallpaper_open_exit.xml
View File

@@ -20,13 +20,13 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false" android:zAdjustment="top">
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:interpolator="@interpolator/linear"
android:interpolator="@interpolator/accelerate_decelerate"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:duration="200" />
<scale android:fromXScale="1.0" android:toXScale="0.4"
android:fromYScale="1.0" android:toYScale="0.4"
<scale android:fromXScale="1.0" android:toXScale="0.5"
android:fromYScale="1.0" android:toYScale="0.5"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@interpolator/decelerate_quad"
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
android:duration="250" />
android:duration="375" />
</set>