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

Commit 3bc72e55 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix import statement in view|transition|animation packages."

parents 85fe52da 67e2ae86

core/java/android/animation/KeyframeSet.java

+4 −4
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ 


package android.animation;



import java.util.Arrays;

import java.util.List;



import android.animation.Keyframe.IntKeyframe;

import android.animation.Keyframe.FloatKeyframe;

import android.animation.Keyframe.IntKeyframe;

import android.animation.Keyframe.ObjectKeyframe;

import android.graphics.Path;

import android.util.Log;



import java.util.Arrays;

import java.util.List;



/**

 * This class holds a collection of Keyframe objects and is called by ValueAnimator to calculate

 * values between those keyframes for a given animation. The class internal to the animation

core/java/android/transition/ChangeBounds.java

+4 −5
Original line number Diff line number Diff line
@@ -16,19 +16,18 @@ 


package android.transition;



import android.animation.AnimatorSet;

import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.PointF;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.animation.PropertyValuesHolder;

import android.animation.RectEvaluator;

import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Path;

import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

core/java/android/transition/ChangeScroll.java

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package android.transition; 
import android.animation.Animator;

import android.animation.ObjectAnimator;

import android.content.Context;

import android.transition.Transition;

import android.transition.TransitionValues;

import android.util.AttributeSet;

import android.view.View;

import android.view.ViewGroup;

core/java/android/transition/ChangeTransform.java

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.util.Property; 
import android.view.GhostView;

import android.view.View;

import android.view.ViewGroup;



import com.android.internal.R;



/**

core/java/android/transition/Explode.java

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package android.transition;



import com.android.internal.R;



import android.animation.Animator;

import android.animation.TimeInterpolator;

import android.content.Context;
@@ -26,6 +24,8 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.animation.AccelerateInterpolator;

import android.view.animation.DecelerateInterpolator;



import com.android.internal.R;

/**

 * This transition tracks changes to the visibility of target views in the

 * start and end scenes and moves views in or out from the edges of the