diff options
author | Alan Viverette <alanv@google.com> | 2014-04-07 10:58:25 -0700 |
---|---|---|
committer | Alan Viverette <alanv@google.com> | 2014-04-07 10:58:25 -0700 |
commit | e106ac7f7c28cd8711e533810e4b3218adadc40f (patch) | |
tree | 8babebabe1c37681dbfcdadcf779bc2e478ed4c3 /graphics | |
parent | 012785d8cbaadb4041707af350e122ad29d22151 (diff) | |
download | frameworks_base-e106ac7f7c28cd8711e533810e4b3218adadc40f.zip frameworks_base-e106ac7f7c28cd8711e533810e4b3218adadc40f.tar.gz frameworks_base-e106ac7f7c28cd8711e533810e4b3218adadc40f.tar.bz2 |
Fix sharing of child bounsd within touch feedback drawable
Change-Id: I13f2f32fb618f07bd967d98d6369399f1d790125
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java b/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java index 64de95f..1641511 100644 --- a/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java +++ b/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java @@ -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) { |