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

Merge "fragment transitions" into jb-dev

Browse Source
This commit is contained in:
Brandon Keely
2012-05-10 16:46:40 -07:00
committed by Android (Google) Code Review
parent fef47f422a 963daf28e5
commit 86f23aaa7c
4 changed files with 24 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,24 +16,11 @@
** limitations under the License.
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:zAdjustment="normal">
<objectAnimator
android:interpolator="@interpolator/decelerate_quint"
android:valueFrom="0.975" android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="scaleY"
android:duration="@android:integer/config_activityDefaultDur"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_quint"
android:valueFrom="0.975" android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="scaleX"
android:duration="@android:integer/config_activityDefaultDur"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">
<objectAnimator
android:interpolator="@interpolator/decelerate_quad"
android:valueFrom="0.0" android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="alpha"
android:duration="@android:integer/config_activityDefaultDur"/>
android:duration="300"/>
</set>

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

@@ -16,24 +16,23 @@
** limitations under the License.
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:zAdjustment="top">
<objectAnimator
android:interpolator="@interpolator/decelerate_quint"
android:valueFrom="1.0" android:valueTo="1.075"
<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="top">
<objectAnimator
android:interpolator="@interpolator/decelerate_quad"
android:valueFrom="1.0" android:valueTo="0.8"
android:valueType="floatType"
android:propertyName="scaleY"
android:duration="@android:integer/config_activityDefaultDur"/>
android:duration="300"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_quint"
android:valueFrom="1.0" android:valueTo="1.075"
android:interpolator="@interpolator/decelerate_quad"
android:valueFrom="1.0" android:valueTo="0.8"
android:valueType="floatType"
android:propertyName="scaleX"
android:duration="@android:integer/config_activityDefaultDur"/>
android:duration="300"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:interpolator="@interpolator/decelerate_quad"
android:valueFrom="1.0" android:valueTo="0.0"
android:valueType="floatType"
android:propertyName="alpha"
android:duration="@android:integer/config_activityDefaultDur"/>
android:duration="300"/>
</set>

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

@@ -17,22 +17,22 @@
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:interpolator="@interpolator/decelerate_quint"
android:valueFrom="1.125" android:valueTo="1.0"
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0.8" android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="scaleY"
android:duration="@android:integer/config_activityDefaultDur"/>
android:duration="300"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_quint"
android:valueFrom="1.125" android:valueTo="1.0"
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0.8" android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="scaleX"
android:duration="@android:integer/config_activityDefaultDur"/>
android:duration="300"/>
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="0.0" android:valueTo="1.0"
android:valueType="floatType"
android:propertyName="alpha"
android:duration="@android:integer/config_activityDefaultDur"/>
android:duration="300"/>
</set>

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

@@ -17,22 +17,10 @@
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:interpolator="@interpolator/linear"
android:valueFrom="1.0" android:valueTo="0.975"
android:valueType="floatType"
android:propertyName="scaleY"
android:duration="@android:integer/config_activityDefaultDur"/>
<objectAnimator
android:interpolator="@interpolator/linear"
android:valueFrom="1.0" android:valueTo="0.975"
android:valueType="floatType"
android:propertyName="scaleX"
android:duration="@android:integer/config_activityDefaultDur"/>
<objectAnimator
<objectAnimator
android:interpolator="@interpolator/decelerate_cubic"
android:valueFrom="1.0" android:valueTo="0.0"
android:valueType="floatType"
android:propertyName="alpha"
android:duration="@android:integer/config_activityDefaultDur"/>
android:duration="300"/>
</set>