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

Commit ce605142 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 26717 into eclair 

* changes:
  Newer animations.
parents 6e35b50e 5baba169

api/current.xml

+35 −0
Original line number Diff line number Diff line
@@ -2825,6 +2825,17 @@ 
 visibility="public"

>

</field>

<field name="detachWallpaper"

 type="int"

 transient="false"

 volatile="false"

 value="16843430"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="detailColumn"

 type="int"

 transient="false"
@@ -162482,6 +162493,17 @@ 
 visibility="protected"

>

</method>

<method name="getDetachWallpaper"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getDuration"

 return="long"

 abstract="false"
@@ -162728,6 +162750,19 @@ 
<parameter name="listener" type="android.view.animation.Animation.AnimationListener">

</parameter>

</method>

<method name="setDetachWallpaper"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="detachWallpaper" type="boolean">

</parameter>

</method>

<method name="setDuration"

 return="void"

 abstract="false"

core/java/android/view/animation/Animation.java

+28 −0
Original line number Diff line number Diff line
@@ -175,6 +175,11 @@ public abstract class Animation implements Cloneable { 
     */

    private int mZAdjustment;

    

    /**

     * Don't animate the wallpaper.

     */

    private boolean mDetachWallpaper = false;



    private boolean mMore = true;

    private boolean mOneMoreTime = true;
@@ -218,6 +223,8 @@ public abstract class Animation implements Cloneable { 


        setZAdjustment(a.getInt(com.android.internal.R.styleable.Animation_zAdjustment, ZORDER_NORMAL));

        

        setDetachWallpaper(a.getBoolean(com.android.internal.R.styleable.Animation_detachWallpaper, false));

        

        ensureInterpolator();



        a.recycle();
@@ -514,6 +521,19 @@ public abstract class Animation implements Cloneable { 
        mZAdjustment = zAdjustment;

    }

    

    /**

     * If detachWallpaper is true, and this is a window animation of a window

     * that has a wallpaper background, then the window will be detached from

     * the wallpaper while it runs.  That is, the animation will only be applied

     * to the window, and the wallpaper behind it will remain static.

     *

     * @param detachWallpaper true if the wallpaper should be detached from the animation

     * @attr ref android.R.styleable#Animation_detachWallpaper

     */

    public void setDetachWallpaper(boolean detachWallpaper) {

        mDetachWallpaper = detachWallpaper;

    }



    /**

     * Gets the acceleration curve type for this animation.

     *
@@ -610,6 +630,14 @@ public abstract class Animation implements Cloneable { 
        return mZAdjustment;

    }



    /**

     * Return value of {@link #setDetachWallpaper(boolean)}.

     * @attr ref android.R.styleable#Animation_detachWallpaper

     */

    public boolean getDetachWallpaper() {

        return mDetachWallpaper;

    }



    /**

     * <p>Indicates whether or not this animation will affect the transformation

     * matrix. For instance, a fade animation will not affect the matrix whereas

core/res/res/anim/wallpaper_close_enter.xml

+15 −0
Original line number Diff line number Diff line
@@ -17,8 +17,22 @@ 
*/

-->



<!-- This version zooms the new non-wallpaper down on top of the

     wallpaper, without zooming the wallpaper itself. -->

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

        android:interpolator="@anim/decelerate_interpolator"

        android:zAdjustment="top">

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

           android:fromYScale="2.0" android:toYScale="1.0"

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

           android:duration="@android:integer/config_mediumAnimTime" />

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

            android:duration="@android:integer/config_mediumAnimTime"/>

</set>



<!-- This version zooms the new non-wallpaper down on top of the

     wallpaper. -->

<!-- 

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

        android:interpolator="@anim/decelerate_interpolator">

    <scale android:fromXScale="2.0" android:toXScale="1.0"
@@ -26,6 +40,7 @@ 
           android:pivotX="50%p" android:pivotY="50%p"

           android:duration="@android:integer/config_mediumAnimTime" />

</set>

-->



<!-- This version is a variation on the inter-activity slide that

    also scales the wallpaper. -->

core/res/res/anim/wallpaper_close_exit.xml

+13 −0
Original line number Diff line number Diff line
@@ -17,8 +17,20 @@ 
*/

-->



<!-- This version zooms the new non-wallpaper down on top of the

     wallpaper, without zooming the wallpaper itself. -->

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

        android:interpolator="@anim/decelerate_interpolator"

        android:detachWallpaper="true">

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

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

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

           android:duration="@android:integer/config_mediumAnimTime" />

</set>



<!-- This version zooms the new non-wallpaper down on top of the

     wallpaper.  The wallpaper here just stays fixed behind. -->

<!--

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

        android:interpolator="@anim/decelerate_interpolator"

        android:zAdjustment="top">
@@ -29,6 +41,7 @@ 
    <alpha android:fromAlpha="1.0" android:toAlpha="0"

            android:duration="@android:integer/config_mediumAnimTime"/>

</set>

-->



<!-- This version is a variation on the inter-activity slide that

    also scales the wallpaper. -->

core/res/res/anim/wallpaper_open_enter.xml

+13 −0
Original line number Diff line number Diff line
@@ -17,8 +17,20 @@ 
*/

-->



<!-- This version zooms the new non-wallpaper down on top of the

     wallpaper, without zooming the wallpaper itself. -->

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

        android:interpolator="@anim/decelerate_interpolator"

        android:detachWallpaper="true">

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

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

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

           android:duration="@android:integer/config_mediumAnimTime" />

</set>



<!-- This version zooms the new non-wallpaper up off the wallpaper the

     wallpaper.  The wallpaper here just stays fixed behind. -->

<!--

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

        android:interpolator="@anim/decelerate_interpolator"

        android:zAdjustment="top">
@@ -29,6 +41,7 @@ 
    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

            android:duration="@android:integer/config_mediumAnimTime"/>

</set>

-->



<!-- This version is a variation on the inter-activity slide that

    also scales the wallpaper. -->