Merge "Making task transitions more akin to wallpaper transitions, now that launching from All Apps invokes the task transition."
This commit is contained in:
committed by
Android (Google) Code Review
commit
1aa952c11d
@@ -18,17 +18,17 @@
|
||||
-->
|
||||
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:background="#ff000000" android:shareInterpolator="false">
|
||||
<scale android:fromXScale="1.0" android:toXScale="1.0"
|
||||
android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal">
|
||||
<scale android:fromXScale="0.95" android:toXScale="1.0"
|
||||
android:fromYScale="0.95" android:toYScale="1.0"
|
||||
android:pivotX="50%p" android:pivotY="50%p"
|
||||
android:fillEnabled="true" android:fillBefore="true"
|
||||
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
|
||||
android:interpolator="@interpolator/decelerate_quint"
|
||||
android:startOffset="150"
|
||||
android:duration="250" />
|
||||
<alpha android:fromAlpha="0" android:toAlpha="1.0"
|
||||
android:fillEnabled="true" android:fillBefore="true"
|
||||
android:interpolator="@interpolator/decelerate_quint"
|
||||
android:startOffset="150"
|
||||
android:duration="250"/>
|
||||
</set>
|
||||
android:startOffset="200"
|
||||
android:duration="300" />
|
||||
<alpha android:fromAlpha="0" android:toAlpha="1.0"
|
||||
android:interpolator="@interpolator/decelerate_cubic"
|
||||
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
|
||||
android:startOffset="200"
|
||||
android:duration="300"/>
|
||||
</set>
|
||||
@@ -18,15 +18,18 @@
|
||||
-->
|
||||
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:background="#ff000000" android:shareInterpolator="false">
|
||||
<scale android:fromXScale="1.0" android:toXScale="1.0"
|
||||
android:fromYScale="1.0" android:toYScale="0.0"
|
||||
android:pivotX="50%p" android:pivotY="50%p"
|
||||
android:fillEnabled="true" android:fillAfter="true"
|
||||
android:interpolator="@interpolator/accelerate_cubic"
|
||||
android:duration="150" />
|
||||
<alpha android:fromAlpha="1.0" android:toAlpha="0"
|
||||
android:fillEnabled="true" android:fillAfter="true"
|
||||
android:interpolator="@interpolator/decelerate_cubic"
|
||||
android:duration="150"/>
|
||||
android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top">
|
||||
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
|
||||
android:interpolator="@interpolator/accelerate_cubic"
|
||||
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
|
||||
android:duration="200" />
|
||||
<scale android:fromXScale="1.0" android:toXScale="1.2"
|
||||
android:fromYScale="1.0" android:toYScale="0.8"
|
||||
android:pivotX="50%p" android:pivotY="50%p"
|
||||
android:interpolator="@interpolator/accelerate_quint"
|
||||
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
|
||||
android:duration="200" />
|
||||
<!-- This is needed to keep the animation running while task_close_enter completes -->
|
||||
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
|
||||
android:duration="500" />
|
||||
</set>
|
||||
@@ -18,17 +18,17 @@
|
||||
-->
|
||||
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:background="#ff000000" android:shareInterpolator="false">
|
||||
<scale android:fromXScale="1.0" android:toXScale="1.0"
|
||||
android:fromYScale=".9" android:toYScale="1.0"
|
||||
android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top">
|
||||
<scale android:fromXScale="1.2" android:toXScale="1.0"
|
||||
android:fromYScale=".8" android:toYScale="1.0"
|
||||
android:pivotX="50%p" android:pivotY="50%p"
|
||||
android:fillEnabled="true" android:fillBefore="true"
|
||||
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
|
||||
android:interpolator="@interpolator/decelerate_quint"
|
||||
android:startOffset="150"
|
||||
android:duration="250" />
|
||||
android:startOffset="300"
|
||||
android:duration="240" />
|
||||
<alpha android:fromAlpha="0" android:toAlpha="1.0"
|
||||
android:fillEnabled="true" android:fillBefore="true"
|
||||
android:interpolator="@interpolator/decelerate_quint"
|
||||
android:startOffset="150"
|
||||
android:duration="250"/>
|
||||
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
|
||||
android:interpolator="@interpolator/decelerate_quad"
|
||||
android:startOffset="300"
|
||||
android:duration="300"/>
|
||||
</set>
|
||||
@@ -18,15 +18,18 @@
|
||||
-->
|
||||
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:background="#ff000000" android:shareInterpolator="false">
|
||||
<scale android:fromXScale="1.0" android:toXScale="1.0"
|
||||
android:fromYScale="1.0" android:toYScale="0.0"
|
||||
android:pivotX="50%p" android:pivotY="50%p"
|
||||
android:fillEnabled="true" android:fillAfter="true"
|
||||
android:interpolator="@interpolator/accelerate_cubic"
|
||||
android:duration="150" />
|
||||
<alpha android:fromAlpha="1.0" android:toAlpha="0"
|
||||
android:fillEnabled="true" android:fillAfter="true"
|
||||
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/decelerate_cubic"
|
||||
android:duration="150"/>
|
||||
android:duration="200"/>
|
||||
<scale android:fromXScale="1.0" android:toXScale="0.95"
|
||||
android:fromYScale="1.0" android:toYScale="0.95"
|
||||
android:pivotX="50%p" android:pivotY="50%p"
|
||||
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
|
||||
android:interpolator="@interpolator/decelerate_quint"
|
||||
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:duration="540" />
|
||||
</set>
|
||||
Reference in New Issue
Block a user