From 1f29e71c4688bdc04b27224c16d5b99006796a80 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 29 Apr 2015 14:28:25 -0700
Subject: 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
---
 graphics/java/android/graphics/drawable/LayerDrawable.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'graphics')

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;
-- 
cgit v1.1