diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java index 81e2f3ca98ecc..b1d618eff40a6 100644 --- a/core/java/android/view/animation/Animation.java +++ b/core/java/android/view/animation/Animation.java @@ -258,6 +258,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)); setShowWallpaper( @@ -630,15 +632,16 @@ public abstract class Animation implements Cloneable { } /** - * Set background behind an animation. + * Set background behind animation. * - * @param bg The background color. If 0, no background. + * @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) { - mBackgroundColor = bg; + // The background color is not needed any more, do nothing. } /** @@ -800,7 +803,7 @@ public abstract class Animation implements Cloneable { @Deprecated @ColorInt public int getBackgroundColor() { - return mBackgroundColor; + return 0; } /** diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index e26984a0d9921..a5f505176d5d1 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -6822,8 +6822,9 @@ content for the duration of the animation. --> - + @@ -7736,7 +7737,7 @@ diff --git a/services/core/java/com/android/server/wm/AnimationAdapter.java b/services/core/java/com/android/server/wm/AnimationAdapter.java index 486328a758dab..529c4f6087433 100644 --- a/services/core/java/com/android/server/wm/AnimationAdapter.java +++ b/services/core/java/com/android/server/wm/AnimationAdapter.java @@ -16,7 +16,6 @@ package com.android.server.wm; -import android.annotation.ColorInt; import android.util.proto.ProtoOutputStream; import android.view.SurfaceControl; import android.view.SurfaceControl.Transaction; @@ -107,14 +106,4 @@ interface AnimationAdapter { default boolean shouldDeferAnimationFinish(Runnable endDeferFinishCallback) { return false; } - - /** - * Gets the background color to show behind an animation. - * - * @return The background color to show behind an animation (0 for no background color). - */ - @ColorInt - default int getBackgroundColor() { - return 0; - } } diff --git a/services/core/java/com/android/server/wm/LocalAnimationAdapter.java b/services/core/java/com/android/server/wm/LocalAnimationAdapter.java index 8f161bf6ecc40..520bd8b2108e2 100644 --- a/services/core/java/com/android/server/wm/LocalAnimationAdapter.java +++ b/services/core/java/com/android/server/wm/LocalAnimationAdapter.java @@ -19,7 +19,6 @@ package com.android.server.wm; import static com.android.server.wm.AnimationAdapterProto.LOCAL; import static com.android.server.wm.LocalAnimationAdapterProto.ANIMATION_SPEC; -import android.annotation.ColorInt; import android.os.SystemClock; import android.util.proto.ProtoOutputStream; import android.view.SurfaceControl; @@ -72,12 +71,6 @@ class LocalAnimationAdapter implements AnimationAdapter { return mSpec.calculateStatusBarTransitionStartTime(); } - @Override - @ColorInt - public int getBackgroundColor() { - return mSpec.getBackgroundColor(); - } - @Override public void dump(PrintWriter pw, String prefix) { mSpec.dump(pw, prefix); @@ -156,9 +149,5 @@ class LocalAnimationAdapter implements AnimationAdapter { } void dumpDebugInner(ProtoOutputStream proto); - - default int getBackgroundColor() { - return 0; - } } } diff --git a/services/core/java/com/android/server/wm/WindowAnimationSpec.java b/services/core/java/com/android/server/wm/WindowAnimationSpec.java index 08758afcb0b24..073a508083f07 100644 --- a/services/core/java/com/android/server/wm/WindowAnimationSpec.java +++ b/services/core/java/com/android/server/wm/WindowAnimationSpec.java @@ -21,7 +21,6 @@ import static com.android.server.wm.AnimationSpecProto.WINDOW; import static com.android.server.wm.WindowAnimationSpecProto.ANIMATION; import static com.android.server.wm.WindowStateAnimator.ROOT_TASK_CLIP_NONE; -import android.annotation.ColorInt; import android.graphics.Point; import android.graphics.Rect; import android.os.SystemClock; @@ -85,12 +84,6 @@ public class WindowAnimationSpec implements AnimationSpec { return mAnimation.computeDurationHint(); } - @Override - @ColorInt - public int getBackgroundColor() { - return mAnimation.getBackgroundColor(); - } - @Override public void apply(Transaction t, SurfaceControl leash, long currentPlayTime) { final TmpValues tmp = mThreadLocalTmps.get();