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

Commit 1a45b94f authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Undeprecate animation background color" into tm-dev am: 7fb93979

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045230

Change-Id: Ief8281d2a0e8c7b937b4e71f94e59c38a6e343f5
parents 2c144e14 7fb93979
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -52262,7 +52262,7 @@ package android.view.animation {
    method protected android.view.animation.Animation clone() throws java.lang.CloneNotSupportedException;
    method public long computeDurationHint();
    method protected void ensureInterpolator();
    method @Deprecated @ColorInt public int getBackgroundColor();
    method @ColorInt public int getBackgroundColor();
    method @Deprecated public boolean getDetachWallpaper();
    method public long getDuration();
    method public boolean getFillAfter();
@@ -52287,7 +52287,7 @@ package android.view.animation {
    method public void restrictDuration(long);
    method public void scaleCurrentDuration(float);
    method public void setAnimationListener(android.view.animation.Animation.AnimationListener);
    method @Deprecated public void setBackgroundColor(@ColorInt int);
    method public void setBackgroundColor(@ColorInt int);
    method @Deprecated public void setDetachWallpaper(boolean);
    method public void setDuration(long);
    method public void setFillAfter(boolean);
+2 −7
Original line number Diff line number Diff line
@@ -646,11 +646,9 @@ public abstract class Animation implements Cloneable {
     * @param bg The background color.  If 0, no background.  Currently must
     * be black, with any desired alpha level.
     *
     * @deprecated None of window animations are running with background color.
     */
    @Deprecated
    public void setBackgroundColor(@ColorInt int bg) {
        // The background color is not needed any more, do nothing.
        mBackgroundColor = bg;
    }

    /**
@@ -824,13 +822,10 @@ public abstract class Animation implements Cloneable {

    /**
     * Returns the background color behind the animation.
     *
     * @deprecated None of window animations are running with background color.
     */
    @Deprecated
    @ColorInt
    public int getBackgroundColor() {
        return 0;
        return mBackgroundColor;
    }

    /**
+4 −0
Original line number Diff line number Diff line
@@ -434,6 +434,10 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler {
                        // If available use the background color provided through AnimationOptions
                        backgroundColorForTransition =
                                info.getAnimationOptions().getBackgroundColor();
                    } else if (a.getBackgroundColor() != 0) {
                        // Otherwise fallback on the background color provided through the animation
                        // definition.
                        backgroundColorForTransition = a.getBackgroundColor();
                    } else if (change.getBackgroundColor() != 0) {
                        // Otherwise default to the window's background color if provided through
                        // the theme as the background color for the animation - the top most window