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

Commit 7c892f1b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Put starting the animation back inside state changed check" into sc-dev am: 7395d119 

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

Change-Id: Id079a41692640f6c36b5fa96e3ad4ad56e71fe8f
parents d74e376e 7395d119

graphics/java/android/graphics/drawable/RippleDrawable.java

+11 −11
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ public class RippleDrawable extends LayerDrawable { 
    private void setRippleActive(boolean active) {

        if (mRippleActive != active) {

            mRippleActive = active;

        }

            if (mState.mRippleStyle == STYLE_SOLID) {

                if (active) {

                    tryRippleEnter();
@@ -346,6 +345,7 @@ public class RippleDrawable extends LayerDrawable { 
                }

            }

        }

    }



    private void setBackgroundActive(boolean hovered, boolean focused, boolean pressed) {

        if (mState.mRippleStyle == STYLE_SOLID) {