Merge "Fix issue #3400119: API to specify a black background behind a window transition"

1 files changed, 24 insertions, 0 deletions

diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java
index 13d0ec198305..87c759c48853 100644
--- a/core/java/android/view/animation/Animation.java
+++ b/core/java/android/view/animation/Animation.java
@@ -181,6 +181,11 @@ public abstract class Animation implements Cloneable {
     private int mZAdjustment;
 
     /**
+     * Desired background color behind animation.
+     */
+    private int mBackgroundColor;
+
+    /**
      * scalefactor to apply to pivot points, etc. during animation. Subclasses retrieve the
      * value via getScaleFactor().
      */
@@ -236,6 +241,8 @@ public abstract class Animation implements Cloneable {
 
         setZAdjustment(a.getInt(com.android.internal.R.styleable.Animation_zAdjustment, ZORDER_NORMAL));
         
+        setBackgroundColor(a.getInt(com.android.internal.R.styleable.Animation_background, 0));
+
         setDetachWallpaper(a.getBoolean(com.android.internal.R.styleable.Animation_detachWallpaper, false));
         
         ensureInterpolator();
@@ -568,6 +575,16 @@ public abstract class Animation implements Cloneable {
     }
     
     /**
+     * Set background behind animation.
+     *
+     * @param bg The background color.  If 0, no background.  Currently must
+     * be black, with any desired alpha level.
+     */
+    public void setBackgroundColor(int bg) {
+        mBackgroundColor = bg;
+    }
+
+    /**
      * The scale factor is set by the call to <code>getTransformation</code>. Overrides of 
      * {@link #getTransformation(long, Transformation, float)} will get this value
      * directly. Overrides of {@link #applyTransformation(float, Transformation)} can
@@ -690,6 +707,13 @@ public abstract class Animation implements Cloneable {
     }
 
     /**
+     * Returns the background color behind the animation.
+     */
+    public int getBackgroundColor() {
+        return mBackgroundColor;
+    }
+
+    /**
      * Return value of {@link #setDetachWallpaper(boolean)}.
      * @attr ref android.R.styleable#Animation_detachWallpaper
      */