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

Commit 4a4f0cd8 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Implement rotation animations."

parents 536c58fb f9d0be91

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -249201,7 +249201,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/java/android/view/animation/ScaleAnimation.java

+89 −4
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package android.view.animation;



import android.content.Context;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.util.AttributeSet;

import android.util.TypedValue;



/**

 * An animation that controls the scale of an object. You can specify the point
@@ -26,11 +28,23 @@ import android.util.AttributeSet; 
 * 

 */

public class ScaleAnimation extends Animation {

    private final Resources mResources;



    private float mFromX;

    private float mToX;

    private float mFromY;

    private float mToY;



    private int mFromXType = TypedValue.TYPE_NULL;

    private int mToXType = TypedValue.TYPE_NULL;

    private int mFromYType = TypedValue.TYPE_NULL;

    private int mToYType = TypedValue.TYPE_NULL;



    private int mFromXData = 0;

    private int mToXData = 0;

    private int mFromYData = 0;

    private int mToYData = 0;



    private int mPivotXType = ABSOLUTE;

    private int mPivotYType = ABSOLUTE;

    private float mPivotXValue = 0.0f;
@@ -48,14 +62,60 @@ public class ScaleAnimation extends Animation { 
    public ScaleAnimation(Context context, AttributeSet attrs) {

        super(context, attrs);



        mResources = context.getResources();



        TypedArray a = context.obtainStyledAttributes(attrs,

                com.android.internal.R.styleable.ScaleAnimation);



        mFromX = a.getFloat(com.android.internal.R.styleable.ScaleAnimation_fromXScale, 0.0f);

        mToX = a.getFloat(com.android.internal.R.styleable.ScaleAnimation_toXScale, 0.0f);

        TypedValue tv = a.peekValue(

                com.android.internal.R.styleable.ScaleAnimation_fromXScale);

        mFromX = 0.0f;

        if (tv != null) {

            if (tv.type == TypedValue.TYPE_FLOAT) {

                // This is a scaling factor.

                mFromX = tv.getFloat();

            } else {

                mFromXType = tv.type;

                mFromXData = tv.data;

            }

        }

        tv = a.peekValue(

                com.android.internal.R.styleable.ScaleAnimation_toXScale);

        mToX = 0.0f;

        if (tv != null) {

            if (tv.type == TypedValue.TYPE_FLOAT) {

                // This is a scaling factor.

                mToX = tv.getFloat();

            } else {

                mToXType = tv.type;

                mToXData = tv.data;

            }

        }



        mFromY = a.getFloat(com.android.internal.R.styleable.ScaleAnimation_fromYScale, 0.0f);

        mToY = a.getFloat(com.android.internal.R.styleable.ScaleAnimation_toYScale, 0.0f);

        tv = a.peekValue(

                com.android.internal.R.styleable.ScaleAnimation_fromYScale);

        mFromY = 0.0f;

        if (tv != null) {

            if (tv.type == TypedValue.TYPE_FLOAT) {

                // This is a scaling factor.

                mFromY = tv.getFloat();

            } else {

                mFromYType = tv.type;

                mFromYData = tv.data;

            }

        }

        tv = a.peekValue(

                com.android.internal.R.styleable.ScaleAnimation_toYScale);

        mToY = 0.0f;

        if (tv != null) {

            if (tv.type == TypedValue.TYPE_FLOAT) {

                // This is a scaling factor.

                mToY = tv.getFloat();

            } else {

                mToYType = tv.type;

                mToYData = tv.data;

            }

        }



        Description d = Description.parseValue(a.peekValue(

                com.android.internal.R.styleable.ScaleAnimation_pivotX));
@@ -81,6 +141,7 @@ public class ScaleAnimation extends Animation { 
     * @param toY Vertical scaling factor to apply at the end of the animation

     */

    public ScaleAnimation(float fromX, float toX, float fromY, float toY) {

        mResources = null;

        mFromX = fromX;

        mToX = toX;

        mFromY = fromY;
@@ -107,6 +168,7 @@ public class ScaleAnimation extends Animation { 
     */

    public ScaleAnimation(float fromX, float toX, float fromY, float toY,

            float pivotX, float pivotY) {

        mResources = null;

        mFromX = fromX;

        mToX = toX;

        mFromY = fromY;
@@ -146,6 +208,7 @@ public class ScaleAnimation extends Animation { 
     */

    public ScaleAnimation(float fromX, float toX, float fromY, float toY,

            int pivotXType, float pivotXValue, int pivotYType, float pivotYValue) {

        mResources = null;

        mFromX = fromX;

        mToX = toX;

        mFromY = fromY;
@@ -177,10 +240,32 @@ public class ScaleAnimation extends Animation { 
        }

    }



    float resolveScale(float scale, int type, int data, int size, int psize) {

        float targetSize;

        if (type == TypedValue.TYPE_FRACTION) {

            targetSize = TypedValue.complexToFraction(data, size, psize);

        } else if (type == TypedValue.TYPE_DIMENSION) {

            targetSize = TypedValue.complexToDimension(data, mResources.getDisplayMetrics());

        } else {

            return scale;

        }



        if (size == 0) {

            return 1;

        }



        return targetSize/(float)size;

    }



    @Override

    public void initialize(int width, int height, int parentWidth, int parentHeight) {

        super.initialize(width, height, parentWidth, parentHeight);



        mFromX = resolveScale(mFromX, mFromXType, mFromXData, width, parentWidth);

        mToX = resolveScale(mToX, mToXType, mToXData, width, parentWidth);

        mFromY = resolveScale(mFromY, mFromYType, mFromYData, height, parentHeight);

        mToY = resolveScale(mToY, mToYType, mToYData, height, parentHeight);



        mPivotX = resolveSize(mPivotXType, mPivotXValue, width, parentWidth);

        mPivotY = resolveSize(mPivotYType, mPivotYValue, height, parentHeight);

    }

core/res/res/anim/screen_rotate_0_enter.xml

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

<!--

/*

** Copyright 2010, 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:shareInterpolator="false">

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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

</set>

core/res/res/anim/screen_rotate_0_exit.xml

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

<!--

/*

** Copyright 2010, 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:shareInterpolator="false">

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

            android:interpolator="@anim/decelerate_quint_interpolator"

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

</set>

core/res/res/anim/screen_rotate_180_enter.xml

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

<!--

/*

** Copyright 2010, 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: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:interpolator="@anim/decelerate_quint_interpolator"

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

</set>