diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-26 15:18:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-26 15:18:30 -0700 |
| commit | 07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea (patch) | |
| tree | e3021402eb20e30d4008a6a18d33d0a60bba72ed /core/java/android/view | |
| parent | 4e0bf7c48638f5c9b222c8781809019df0b39048 (diff) | |
| parent | 1957d281ea123e4925e51fa5ad22ce239ef2a07d (diff) | |
| download | frameworks_base-07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea.zip frameworks_base-07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea.tar.gz frameworks_base-07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea.tar.bz2 | |
Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/View.java | 10 | ||||
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 6ec6b9a..9d0d4f0 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -14197,11 +14197,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ protected void resolveDrawables() { - if (mBackground != null) { - mBackground.setLayoutDirection(getLayoutDirection()); + if (canResolveLayoutDirection()) { + if (mBackground != null) { + mBackground.setLayoutDirection(getLayoutDirection()); + } + mPrivateFlags2 |= PFLAG2_DRAWABLE_RESOLVED; + onResolveDrawables(getLayoutDirection()); } - mPrivateFlags2 |= PFLAG2_DRAWABLE_RESOLVED; - onResolveDrawables(getLayoutDirection()); } /** diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index c252c77..dc73e85 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3384,7 +3384,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager if (child.isLayoutDirectionInherited()) { child.resetRtlProperties(); - child.resolveRtlPropertiesIfNeeded(); } onViewAdded(child); |