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

Commit 6aee480e authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 2d925545: Merge "Fix sharing of child bounsd within touch feedback drawable" 

* commit '2d925545':
  Fix sharing of child bounsd within touch feedback drawable
parents 9b030ced 2d925545

graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java

+4 −1
Original line number Diff line number Diff line
@@ -485,7 +485,10 @@ public class TouchFeedbackDrawable extends LayerDrawable { 
        } else if (state == null) {

            ns = new TouchFeedbackState(null, this, res);

        } else {

            ns = state;

            // We always need a new state since child drawables contain local

            // state but live within the parent's constant state.

            // TODO: Move child drawables into local state.

            ns = new TouchFeedbackState(state, this, res);

        }



        if (res != null) {