From 0fe197ee9551be5f3ff41f914698e0aa3878ade5 Mon Sep 17 00:00:00 2001
From: Brandon Keely <lbk@google.com>
Date: Mon, 13 Dec 2010 11:33:00 -0800
Subject: [PATCH] Massaging system transitions.

Change-Id: Ic6233f33ef1ee011274631119022b7adc6432ca2
---
 core/res/res/anim/activity_close_enter.xml    | 10 +++++-----
 core/res/res/anim/activity_close_exit.xml     | 11 +++++------
 core/res/res/anim/activity_open_enter.xml     | 11 +++++------
 core/res/res/anim/activity_open_exit.xml      | 13 ++++++-------
 core/res/res/anim/fragment_close_enter.xml    | 13 ++++---------
 core/res/res/anim/fragment_close_exit.xml     | 12 ++++--------
 core/res/res/anim/fragment_open_enter.xml     | 12 ++++--------
 core/res/res/anim/fragment_open_exit.xml      | 16 ++++++----------
 core/res/res/anim/screen_rotate_180_enter.xml | 15 +++++++++++----
 core/res/res/anim/screen_rotate_180_exit.xml  | 16 ++++++++--------
 core/res/res/anim/task_close_enter.xml        |  8 ++++----
 core/res/res/anim/task_close_exit.xml         | 12 ++++++------
 core/res/res/anim/task_open_enter.xml         | 10 +++++-----
 core/res/res/anim/task_open_exit.xml          | 16 ++++++++--------
 14 files changed, 81 insertions(+), 94 deletions(-)

diff --git a/core/res/res/anim/activity_close_enter.xml b/core/res/res/anim/activity_close_enter.xml
index 82d990c3d2243..69437b8757553 100644
--- a/core/res/res/anim/activity_close_enter.xml
+++ b/core/res/res/anim/activity_close_enter.xml
@@ -13,19 +13,19 @@
 ** distributed under the License is distributed on an "AS IS" BASIS, 
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 ** See the License for the specific language governing permissions and 
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
 		android:zAdjustment="normal"
         android:shareInterpolator="false">
-    <scale android:fromXScale="0.98" android:toXScale="1.0"
-            android:fromYScale="0.98" android:toYScale="1.0"
+    <scale android:fromXScale="0.975" android:toXScale="1.0"
+            android:fromYScale="0.975" android:toYScale="1.0"
             android:pivotX="50%p" android:pivotY="50%p"
             android:interpolator="@anim/decelerate_quint_interpolator"
             android:duration="@android:integer/config_activityDefaultDur" />
     <alpha android:fromAlpha=".75" android:toAlpha="1.0"
-            android:interpolator="@anim/decelerate_quint_interpolator"
+            android:interpolator="@anim/decelerate_cubic_interpolator"
             android:duration="@android:integer/config_activityDefaultDur"/>
-</set>
+</set>
\ No newline at end of file
diff --git a/core/res/res/anim/activity_close_exit.xml b/core/res/res/anim/activity_close_exit.xml
index 13768b56620ed..c73bc3ac6a338 100644
--- a/core/res/res/anim/activity_close_exit.xml
+++ b/core/res/res/anim/activity_close_exit.xml
@@ -13,20 +13,19 @@
 ** distributed under the License is distributed on an "AS IS" BASIS, 
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 ** See the License for the specific language governing permissions and 
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
 		android:zAdjustment="top"
         android:shareInterpolator="false">
-    <scale android:fromXScale="1.0" android:toXScale="1.04"
-            android:fromYScale="1.0" android:toYScale="1.04"
+    <scale android:fromXScale="1.0" android:toXScale="1.075"
+            android:fromYScale="1.0" android:toYScale="1.075"
             android:pivotX="50%p" android:pivotY="50%p"
             android:interpolator="@anim/decelerate_quint_interpolator"
             android:duration="@android:integer/config_activityDefaultDur" />
     <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
-            android:interpolator="@anim/decelerate_quint_interpolator"
+            android:interpolator="@anim/decelerate_cubic_interpolator"
             android:duration="@android:integer/config_activityDefaultDur"/>
-
-</set>
+</set>
\ No newline at end of file
diff --git a/core/res/res/anim/activity_open_enter.xml b/core/res/res/anim/activity_open_enter.xml
index 4841910e2e23f..7b6a7f0c419d2 100644
--- a/core/res/res/anim/activity_open_enter.xml
+++ b/core/res/res/anim/activity_open_enter.xml
@@ -13,20 +13,19 @@
 ** distributed under the License is distributed on an "AS IS" BASIS, 
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 ** See the License for the specific language governing permissions and 
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
 		android:zAdjustment="top"
         android:shareInterpolator="false">
-    <scale android:fromXScale="1.04" android:toXScale="1.0"
-            android:fromYScale="1.04" android:toYScale="1.0"
+    <scale android:fromXScale="1.125" android:toXScale="1.0"
+            android:fromYScale="1.125" android:toYScale="1.0"
             android:pivotX="50%p" android:pivotY="50%p"
             android:interpolator="@anim/decelerate_quint_interpolator"
             android:duration="@android:integer/config_activityDefaultDur" />
     <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
-            android:interpolator="@anim/decelerate_quint_interpolator"
+            android:interpolator="@anim/decelerate_cubic_interpolator"
             android:duration="@android:integer/config_activityDefaultDur"/>
-
-</set>
+</set>
\ No newline at end of file
diff --git a/core/res/res/anim/activity_open_exit.xml b/core/res/res/anim/activity_open_exit.xml
index 81e902f3d5ff2..b07ab2be41004 100644
--- a/core/res/res/anim/activity_open_exit.xml
+++ b/core/res/res/anim/activity_open_exit.xml
@@ -13,20 +13,19 @@
 ** distributed under the License is distributed on an "AS IS" BASIS, 
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 ** See the License for the specific language governing permissions and 
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
 		android:zAdjustment="normal"
         android:shareInterpolator="false">
-    <scale android:fromXScale="1.0" android:toXScale="0.98"
-            android:fromYScale="1.0" android:toYScale="0.98"
+    <scale android:fromXScale="1.0" android:toXScale="0.975"
+            android:fromYScale="1.0" android:toYScale="0.975"
             android:pivotX="50%p" android:pivotY="50%p"
-            android:interpolator="@anim/decelerate_quint_interpolator"
+            android:interpolator="@anim/linear_interpolator"
             android:duration="@android:integer/config_activityDefaultDur" />
     <alpha android:fromAlpha="1.0" android:toAlpha="0.75"
-            android:interpolator="@anim/decelerate_quint_interpolator"
+            android:interpolator="@anim/decelerate_cubic_interpolator"
             android:duration="@android:integer/config_activityDefaultDur"/>
-
-</set>
+</set>
\ No newline at end of file
diff --git a/core/res/res/anim/fragment_close_enter.xml b/core/res/res/anim/fragment_close_enter.xml
index c1b564b662c39..eaa192fefcad3 100644
--- a/core/res/res/anim/fragment_close_enter.xml
+++ b/core/res/res/anim/fragment_close_enter.xml
@@ -13,32 +13,27 @@
 ** distributed under the License is distributed on an "AS IS" BASIS,
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ** See the License for the specific language governing permissions and
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android"
 	android:zAdjustment="normal">
-
     <objectAnimator
         android:interpolator="@anim/decelerate_quint_interpolator"
-        android:valueFrom="0.98"
-        android:valueTo="1.0"
+        android:valueFrom="0.975" android:valueTo="1.0"
         android:valueType="floatType"
         android:propertyName="scaleY"
         android:duration="@android:integer/config_activityDefaultDur"/>
     <objectAnimator
         android:interpolator="@anim/decelerate_quint_interpolator"
-        android:valueFrom="0.98"
-        android:valueTo="1.0"
+        android:valueFrom="0.975" android:valueTo="1.0"
         android:valueType="floatType"
         android:propertyName="scaleX"
         android:duration="@android:integer/config_activityDefaultDur"/>
     <objectAnimator
         android:interpolator="@anim/decelerate_cubic_interpolator"
-        android:valueFrom="0.0"
-        android:valueTo="1.0"
+        android:valueFrom="0.0" android:valueTo="1.0"
         android:valueType="floatType"
         android:propertyName="alpha"
         android:duration="@android:integer/config_activityDefaultDur"/>
-
 </set>
\ No newline at end of file
diff --git a/core/res/res/anim/fragment_close_exit.xml b/core/res/res/anim/fragment_close_exit.xml
index 2ce358f44cc1d..8851e3a861e8a 100644
--- a/core/res/res/anim/fragment_close_exit.xml
+++ b/core/res/res/anim/fragment_close_exit.xml
@@ -13,31 +13,27 @@
 ** distributed under the License is distributed on an "AS IS" BASIS,
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ** See the License for the specific language governing permissions and
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android"
 	android:zAdjustment="top">
     <objectAnimator
         android:interpolator="@anim/decelerate_quint_interpolator"
-        android:valueFrom="1.0"
-        android:valueTo="1.04"
+        android:valueFrom="1.0" android:valueTo="1.075"
         android:valueType="floatType"
         android:propertyName="scaleY"
         android:duration="@android:integer/config_activityDefaultDur"/>
     <objectAnimator
         android:interpolator="@anim/decelerate_quint_interpolator"
-        android:valueFrom="1.0"
-        android:valueTo="1.04"
+        android:valueFrom="1.0" android:valueTo="1.075"
         android:valueType="floatType"
         android:propertyName="scaleX"
         android:duration="@android:integer/config_activityDefaultDur"/>
     <objectAnimator
         android:interpolator="@anim/decelerate_cubic_interpolator"
-        android:valueFrom="1.0"
-        android:valueTo="0.0"
+        android:valueFrom="1.0" android:valueTo="0.0"
         android:valueType="floatType"
         android:propertyName="alpha"
         android:duration="@android:integer/config_activityDefaultDur"/>
-
 </set>
\ No newline at end of file
diff --git a/core/res/res/anim/fragment_open_enter.xml b/core/res/res/anim/fragment_open_enter.xml
index e3bde46540d7e..bac75a5198d80 100644
--- a/core/res/res/anim/fragment_open_enter.xml
+++ b/core/res/res/anim/fragment_open_enter.xml
@@ -13,30 +13,26 @@
 ** distributed under the License is distributed on an "AS IS" BASIS,
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ** See the License for the specific language governing permissions and
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <objectAnimator
         android:interpolator="@anim/decelerate_quint_interpolator"
-        android:valueFrom="1.04"
-        android:valueTo="1.0"
+        android:valueFrom="1.125" android:valueTo="1.0"
         android:valueType="floatType"
         android:propertyName="scaleY"
         android:duration="@android:integer/config_activityDefaultDur"/>
     <objectAnimator
         android:interpolator="@anim/decelerate_quint_interpolator"
-        android:valueFrom="1.04"
-        android:valueTo="1.0"
+        android:valueFrom="1.125" android:valueTo="1.0"
         android:valueType="floatType"
         android:propertyName="scaleX"
         android:duration="@android:integer/config_activityDefaultDur"/>
     <objectAnimator
         android:interpolator="@anim/decelerate_cubic_interpolator"
-        android:valueFrom="0.0"
-        android:valueTo="1.0"
+        android:valueFrom="0.0" android:valueTo="1.0"
         android:valueType="floatType"
         android:propertyName="alpha"
         android:duration="@android:integer/config_activityDefaultDur"/>
-
 </set>
\ No newline at end of file
diff --git a/core/res/res/anim/fragment_open_exit.xml b/core/res/res/anim/fragment_open_exit.xml
index b4c2194fd75e6..57f1f9fc689dc 100644
--- a/core/res/res/anim/fragment_open_exit.xml
+++ b/core/res/res/anim/fragment_open_exit.xml
@@ -13,30 +13,26 @@
 ** distributed under the License is distributed on an "AS IS" BASIS,
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ** See the License for the specific language governing permissions and
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <objectAnimator
-        android:interpolator="@anim/decelerate_quint_interpolator"
-        android:valueFrom="1.0"
-        android:valueTo="0.98"
+        android:interpolator="@anim/linear_interpolator"
+        android:valueFrom="1.0" android:valueTo="0.975"
         android:valueType="floatType"
         android:propertyName="scaleY"
         android:duration="@android:integer/config_activityDefaultDur"/>
     <objectAnimator
-        android:interpolator="@anim/decelerate_quint_interpolator"
-        android:valueFrom="1.0"
-        android:valueTo="0.98"
+        android:interpolator="@anim/linear_interpolator"
+        android:valueFrom="1.0" android:valueTo="0.975"
         android:valueType="floatType"
         android:propertyName="scaleX"
         android:duration="@android:integer/config_activityDefaultDur"/>
     <objectAnimator
         android:interpolator="@anim/decelerate_cubic_interpolator"
-        android:valueFrom="1.0"
-        android:valueTo="0.0"
+        android:valueFrom="1.0" android:valueTo="0.0"
         android:valueType="floatType"
         android:propertyName="alpha"
         android:duration="@android:integer/config_activityDefaultDur"/>
-
 </set>
\ No newline at end of file
diff --git a/core/res/res/anim/screen_rotate_180_enter.xml b/core/res/res/anim/screen_rotate_180_enter.xml
index bfc8c6de877b8..a050d9b971837 100644
--- a/core/res/res/anim/screen_rotate_180_enter.xml
+++ b/core/res/res/anim/screen_rotate_180_enter.xml
@@ -13,7 +13,7 @@
 ** distributed under the License is distributed on an "AS IS" BASIS,
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ** See the License for the specific language governing permissions and
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
@@ -21,7 +21,14 @@
         android:shareInterpolator="false">
     <scale android:fromXScale="1.0" android:toXScale="1.0"
             android:fromYScale=".9" android:toYScale="1.0"
-            android:pivotX="50%" android:pivotY="50%"
+            android:pivotX="50%p" android:pivotY="50%p"
+            android:fillEnabled="true" android:fillBefore="true"
             android:interpolator="@anim/decelerate_quint_interpolator"
-            android:duration="@android:integer/config_mediumAnimTime" />
-</set>
+            android:startOffset="160"
+            android:duration="300" />
+    <alpha android:fromAlpha="0" android:toAlpha="1.0"
+            android:fillEnabled="true" android:fillBefore="true"
+            android:interpolator="@anim/decelerate_quint_interpolator"
+            android:startOffset="160"
+            android:duration="300"/>
+</set>
\ No newline at end of file
diff --git a/core/res/res/anim/screen_rotate_180_exit.xml b/core/res/res/anim/screen_rotate_180_exit.xml
index f1ce1cf38a370..f6a65721327ba 100644
--- a/core/res/res/anim/screen_rotate_180_exit.xml
+++ b/core/res/res/anim/screen_rotate_180_exit.xml
@@ -13,18 +13,18 @@
 ** distributed under the License is distributed on an "AS IS" BASIS,
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ** See the License for the specific language governing permissions and
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
         android:shareInterpolator="false">
     <scale android:fromXScale="1.0" android:toXScale="1.0"
-            android:fromYScale="1.0" android:toYScale=".9"
-            android:pivotX="50%" android:pivotY="50%"
-            android:interpolator="@anim/decelerate_quint_interpolator"
-            android:duration="@android:integer/config_mediumAnimTime" />
+            android:fromYScale="1.0" android:toYScale="0.0"
+            android:pivotX="50%p" android:pivotY="50%p"
+            android:interpolator="@anim/accelerate_cubic_interpolator"
+            android:duration="160" />
     <alpha android:fromAlpha="1.0" android:toAlpha="0"
-            android:interpolator="@anim/decelerate_quint_interpolator"
-            android:duration="@android:integer/config_mediumAnimTime" />
-</set>
+            android:interpolator="@anim/decelerate_cubic_interpolator"
+            android:duration="160"/>
+</set>
\ No newline at end of file
diff --git a/core/res/res/anim/task_close_enter.xml b/core/res/res/anim/task_close_enter.xml
index 5057eed04ee59..1e29309d764b1 100644
--- a/core/res/res/anim/task_close_enter.xml
+++ b/core/res/res/anim/task_close_enter.xml
@@ -13,7 +13,7 @@
 ** distributed under the License is distributed on an "AS IS" BASIS, 
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 ** See the License for the specific language governing permissions and 
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
@@ -24,11 +24,11 @@
             android:pivotX="50%p" android:pivotY="50%p"
 			android:fillEnabled="true" android:fillBefore="true"
             android:interpolator="@anim/decelerate_quint_interpolator"
-            android:startOffset="300"
+            android:startOffset="160"
             android:duration="300" />
     <alpha 	android:fromAlpha="0" android:toAlpha="1.0"
-            android:interpolator="@anim/decelerate_cubic_interpolator"
             android:fillEnabled="true" android:fillBefore="true"
-			android:startOffset="300"
+            android:interpolator="@anim/decelerate_quint_interpolator"
+            android:startOffset="160"
             android:duration="300"/>
 </set>
diff --git a/core/res/res/anim/task_close_exit.xml b/core/res/res/anim/task_close_exit.xml
index 169f846e9e767..b232e423cfc6c 100644
--- a/core/res/res/anim/task_close_exit.xml
+++ b/core/res/res/anim/task_close_exit.xml
@@ -13,20 +13,20 @@
 ** distributed under the License is distributed on an "AS IS" BASIS, 
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 ** See the License for the specific language governing permissions and 
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
         android:detachWallpaper="true" android:shareInterpolator="false">
     <scale android:fromXScale="1.0" android:toXScale="1.0"
-			android:fillEnabled="true" android:fillAfter="true"
             android:fromYScale="1.0" android:toYScale="0.0"
             android:pivotX="50%p" android:pivotY="50%p"
-            android:interpolator="@anim/linear_interpolator"
-            android:duration="300" />
+			android:fillEnabled="true" android:fillAfter="true"
+            android:interpolator="@anim/accelerate_cubic_interpolator"
+            android:duration="160" />
     <alpha android:fromAlpha="1.0" android:toAlpha="0"
 			android:fillEnabled="true" android:fillAfter="true"
             android:interpolator="@anim/decelerate_cubic_interpolator"
-            android:duration="150"/>
-</set>
+            android:duration="160"/>
+</set>
\ No newline at end of file
diff --git a/core/res/res/anim/task_open_enter.xml b/core/res/res/anim/task_open_enter.xml
index 8f8515aa48f1f..4a2ae3b8fbfdf 100644
--- a/core/res/res/anim/task_open_enter.xml
+++ b/core/res/res/anim/task_open_enter.xml
@@ -13,22 +13,22 @@
 ** distributed under the License is distributed on an "AS IS" BASIS, 
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 ** See the License for the specific language governing permissions and 
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
         android:shareInterpolator="false">
     <scale android:fromXScale="1.0" android:toXScale="1.0"
-            android:fromYScale="0.95" android:toYScale="1.0"
+            android:fromYScale=".9" android:toYScale="1.0"
             android:pivotX="50%p" android:pivotY="50%p"
             android:fillEnabled="true" android:fillBefore="true"
             android:interpolator="@anim/decelerate_quint_interpolator"
-            android:startOffset="300"
+            android:startOffset="160"
             android:duration="300" />
     <alpha android:fromAlpha="0" android:toAlpha="1.0"
             android:fillEnabled="true" android:fillBefore="true"
             android:interpolator="@anim/decelerate_quint_interpolator"
-            android:startOffset="300"
+            android:startOffset="160"
             android:duration="300"/>
-</set>
+</set>
\ No newline at end of file
diff --git a/core/res/res/anim/task_open_exit.xml b/core/res/res/anim/task_open_exit.xml
index 7d2b1b1cbbf1d..a213bdf1253cc 100644
--- a/core/res/res/anim/task_open_exit.xml
+++ b/core/res/res/anim/task_open_exit.xml
@@ -13,20 +13,20 @@
 ** distributed under the License is distributed on an "AS IS" BASIS, 
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 ** See the License for the specific language governing permissions and 
-** limitations under the License.
+** limitations under the License. 
 */
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-        android:detachWallpaper="true" android:shareInterpolator="false">
+        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="@anim/linear_interpolator"
-            android:duration="300" />
-    <alpha android:fromAlpha="1.0" android:toAlpha="0"
-            android:fillEnabled="true" android:fillAfter="true"
+			android:fillEnabled="true" android:fillAfter="true"
+            android:interpolator="@anim/accelerate_cubic_interpolator"
+            android:duration="160" />
+    <alpha android:fromAlpha="1.0" android:toAlpha="0"		
+			android:fillEnabled="true" android:fillAfter="true"
             android:interpolator="@anim/decelerate_cubic_interpolator"
-            android:duration="150"/>
+            android:duration="160"/>
 </set>
\ No newline at end of file