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

Commit 0fd6b076 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: I4cd377fc7887e286092b9b387f7adb77edecc0ba
parents 2d355922 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) {