am ce605142: Merge change 26717 into eclair

Merge commit 'ce60514221f2a143a0f85a1c63637d674eaa3d58' into eclair-plus-aosp

* commit 'ce60514221f2a143a0f85a1c63637d674eaa3d58':
  Newer animations.
This commit is contained in:
Dianne Hackborn
2009-09-23 17:10:07 -07:00
committed by Android Git Automerger
9 changed files with 135 additions and 8 deletions

View File

@@ -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