summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2013-04-12 01:03:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-12 01:03:33 +0000
commitf5c757c6292fb2623757ef73020d3730ead063d7 (patch)
tree67693a37732a9277a7423b34859d553250553572 /graphics/java
parentc309ca4622833bf47b57366ae038500023de1668 (diff)
parentdc25d25333d3fac96dccfb9bd31d2474d6bc2d78 (diff)
downloadframeworks_base-f5c757c6292fb2623757ef73020d3730ead063d7.zip
frameworks_base-f5c757c6292fb2623757ef73020d3730ead063d7.tar.gz
frameworks_base-f5c757c6292fb2623757ef73020d3730ead063d7.tar.bz2
Merge "More fix for bug #8159072 Spinner widget should be RTL'ized" into jb-mr2-dev
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/DrawableContainer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index a0c9701..8a4d598 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -512,7 +512,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
@Override
public int getChangingConfigurations() {
- return mChangingConfigurations;
+ return mChangingConfigurations | mChildrenChangingConfigurations;
}
public final int addChild(Drawable dr) {