summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-04-29 14:28:25 -0700
committerAlan Viverette <alanv@google.com>2015-04-29 14:28:25 -0700
commit1f29e71c4688bdc04b27224c16d5b99006796a80 (patch)
treeb4f53a1e8c869ee98deb0a7d42043e8470c3d246 /graphics
parent0e0c9d9392e4b4580939632ca4e74f2073e59290 (diff)
downloadframeworks_base-1f29e71c4688bdc04b27224c16d5b99006796a80.zip
frameworks_base-1f29e71c4688bdc04b27224c16d5b99006796a80.tar.gz
frameworks_base-1f29e71c4688bdc04b27224c16d5b99006796a80.tar.bz2
Don't propagate level or RTL in LayerDrawable.setDrawable()
The developer used to be responsible for this and automatically propagating the values breaks some use cases (ex. in Camera). Bug: 20696311 Change-Id: Ia8ddc132c6d629bcc27d66f654baf30d9f078568
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/LayerDrawable.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java
index c3d8cfa..e5b4612 100644
--- a/graphics/java/android/graphics/drawable/LayerDrawable.java
+++ b/graphics/java/android/graphics/drawable/LayerDrawable.java
@@ -564,8 +564,6 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
if (drawable != null) {
drawable.setCallback(this);
- drawable.setLayoutDirection(getLayoutDirection());
- drawable.setLevel(getLevel());
}
childDrawable.mDrawable = drawable;