diff --git a/app/src/main/java/com/hippo/effect/ripple/RippleOldBackground.java b/app/src/main/java/com/hippo/effect/ripple/RippleBackground.java similarity index 98% rename from app/src/main/java/com/hippo/effect/ripple/RippleOldBackground.java rename to app/src/main/java/com/hippo/effect/ripple/RippleBackground.java index 6e9a3923c..61e0f52e7 100644 --- a/app/src/main/java/com/hippo/effect/ripple/RippleOldBackground.java +++ b/app/src/main/java/com/hippo/effect/ripple/RippleBackground.java @@ -31,7 +31,7 @@ import com.nineoldandroids.animation.ObjectAnimator; /** * Draws a Material ripple. */ -class RippleOldBackground { +class RippleBackground { private static final Interpolator LINEAR_INTERPOLATOR = new LinearInterpolator(); private static final float GLOBAL_SPEED = 1.0f; @@ -73,7 +73,7 @@ class RippleOldBackground { /** * Creates a new ripple. */ - public RippleOldBackground(RippleOwner owner, Rect bounds) { + public RippleBackground(RippleOwner owner, Rect bounds) { mOwner = owner; mBounds = bounds; } @@ -228,7 +228,7 @@ class RippleOldBackground { @Override public void onAnimationEnd(Animator animation) { final ObjectAnimator outerFadeOutAnim = ObjectAnimator.ofFloat( - RippleOldBackground.this, "outerOpacity", 0); + RippleBackground.this, "outerOpacity", 0); outerFadeOutAnim.setAutoCancel(true); outerFadeOutAnim.setDuration(outerDuration); outerFadeOutAnim.setInterpolator(LINEAR_INTERPOLATOR); diff --git a/app/src/main/java/com/hippo/effect/ripple/RippleOldDrawable.java b/app/src/main/java/com/hippo/effect/ripple/RippleOldDrawable.java index e62b856b9..ed7a77a5a 100644 --- a/app/src/main/java/com/hippo/effect/ripple/RippleOldDrawable.java +++ b/app/src/main/java/com/hippo/effect/ripple/RippleOldDrawable.java @@ -87,7 +87,7 @@ public class RippleOldDrawable extends Drawable implements RippleOwner, Hotspota private final Rect mHotspotBounds = new Rect(); /** The current background. May be actively animating or pending entry. */ - private RippleOldBackground mBackground; + private RippleBackground mBackground; /** Whether we expect to draw a background when visible. */ private boolean mBackgroundActive; @@ -312,7 +312,7 @@ public class RippleOldDrawable extends Drawable implements RippleOwner, Hotspota */ private void tryBackgroundEnter() { if (mBackground == null) { - mBackground = new RippleOldBackground(this, mHotspotBounds); + mBackground = new RippleBackground(this, mHotspotBounds); } final int color = mColor.getColorForState(getState(), Color.TRANSPARENT);