From 963daf28e51d788c2da2ea6c26602f4f9f7e0ed0 Mon Sep 17 00:00:00 2001
From: Brandon Keely <lbk@google.com>
Date: Thu, 10 May 2012 16:18:17 -0700
Subject: [PATCH] fragment transitions

Change-Id: I8a3078b32b9543dd1b3a79231c3199f842f3cfd1
---
 .../res/res/animator/fragment_close_enter.xml | 21 ++++---------------
 core/res/res/animator/fragment_close_exit.xml | 21 +++++++++----------
 core/res/res/animator/fragment_open_enter.xml | 16 +++++++-------
 core/res/res/animator/fragment_open_exit.xml  | 16 ++------------
 4 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/core/res/res/animator/fragment_close_enter.xml b/core/res/res/animator/fragment_close_enter.xml
index c0abbc599e546..0b2e2cfa57bf7 100644
--- a/core/res/res/animator/fragment_close_enter.xml
+++ b/core/res/res/animator/fragment_close_enter.xml
@@ -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>
\ No newline at end of file
diff --git a/core/res/res/animator/fragment_close_exit.xml b/core/res/res/animator/fragment_close_exit.xml
index 9a5708c578c15..e0ab6077a53b4 100644
--- a/core/res/res/animator/fragment_close_exit.xml
+++ b/core/res/res/animator/fragment_close_exit.xml
@@ -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>
\ No newline at end of file
diff --git a/core/res/res/animator/fragment_open_enter.xml b/core/res/res/animator/fragment_open_enter.xml
index 6b16cb43400c3..8cd0e4e7e6689 100644
--- a/core/res/res/animator/fragment_open_enter.xml
+++ b/core/res/res/animator/fragment_open_enter.xml
@@ -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>
\ No newline at end of file
diff --git a/core/res/res/animator/fragment_open_exit.xml b/core/res/res/animator/fragment_open_exit.xml
index d77ee8ee5efbf..1b505fe2366ac 100644
--- a/core/res/res/animator/fragment_open_exit.xml
+++ b/core/res/res/animator/fragment_open_exit.xml
@@ -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>
\ No newline at end of file