Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e1cf5b4 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Updating task and fragment transitions. (Bug 5285022)" into jb-dev

parents 46bba663 bd127f09

core/res/res/anim/task_close_enter.xml→core/res/res/anim-land/task_close_enter.xml

+18 −14
Original line number Diff line number Diff line
@@ -18,22 +18,26 @@ 
-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="normal">

    <alpha android:fromAlpha="0" android:toAlpha="1"

        android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top">



    <alpha android:fromAlpha="0" android:toAlpha="1.0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="600"

            android:duration="200"/>

    <scale android:fromXScale="0.6" android:toXScale="1.0"

            android:fromYScale="0.6" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="150"

            android:duration="350"/>



    <translate android:fromXDelta="-140%" android:toXDelta="0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="350"

            android:duration="400" />

    <translate android:fromYDelta="-100%" android:toYDelta="0"

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="150"

            android:duration="350"/>



    <scale android:fromXScale=".6" android:toXScale="1.0"

            android:fromYScale=".6" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:startOffset="350"

            android:duration="400"/>

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="150"

            android:duration="350" />



</set>
 
 No newline at end of file

core/res/res/anim/task_open_exit.xml→core/res/res/anim-land/task_close_exit.xml

+12 −9
Original line number Diff line number Diff line
@@ -21,20 +21,23 @@ 
        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="300"/>

            android:interpolator="@interpolator/accelerate_quad"

            android:duration="350"/>



    <translate android:fromXDelta="0" android:toXDelta="140%"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_quad"

            android:duration="350"/>



    <scale android:fromXScale="1.0" android:toXScale="0.6"

            android:fromYScale="1.0" android:toYScale="0.6"

            android:pivotX="50%p" android:pivotY="50%p"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/accelerate_quad"

            android:duration="500" />

    <translate android:fromYDelta="0" android:toYDelta="-100%"

            android:interpolator="@interpolator/accelerate_quad"

            android:duration="500"/>

            android:pivotX="50%p" android:pivotY="50%p"

            android:interpolator="@interpolator/decelerate_cubic"

            android:duration="350" />



    <!-- 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="700" />

            android:duration="500" />

</set>
 
 No newline at end of file

core/res/res/anim/task_open_enter.xml→core/res/res/anim-land/task_open_enter.xml

+17 −8
Original line number Diff line number Diff line
@@ -19,16 +19,25 @@ 


<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top">

    <scale android:fromXScale=".8" android:toXScale="1.0"

            android:fromYScale=".8" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"



    <alpha android:fromAlpha="0" android:toAlpha="1.0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="400"

            android:duration="300" />

    <alpha android:fromAlpha="0" android:toAlpha="1.0"

            android:startOffset="150"

            android:duration="350"/>



    <translate android:fromXDelta="140%" android:toXDelta="0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="150"

            android:duration="350"/>



    <scale android:fromXScale=".6" android:toXScale="1.0"

            android:fromYScale=".6" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="400"

            android:duration="300"/>

            android:startOffset="150"

            android:duration="350" />



</set>
 
 No newline at end of file

core/res/res/anim-land/task_open_exit.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** 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.

*/

-->



<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"/>



    <translate android:fromXDelta="0" android:toXDelta="-140%"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_quad"

            android:duration="350"/>



    <scale android:fromXScale="1.0" android:toXScale="0.6"

            android:fromYScale="1.0" android:toYScale="0.6"

            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" />



    <!-- 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" />

</set>
 
 No newline at end of file

core/res/res/anim-port/task_close_enter.xml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** 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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top">



    <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"/>



    <translate android:fromYDelta="-140%" android:toYDelta="0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_cubic"

            android:startOffset="150"

            android:duration="350"/>



    <scale android:fromXScale=".6" android:toXScale="1.0"

            android:fromYScale=".6" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/decelerate_quad"

            android:startOffset="150"

            android:duration="350" />



</set>
 
 No newline at end of file