diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-11-30 16:36:57 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-30 16:37:17 -0800 |
commit | ce463847db68afbb796377c6a55209e102774f8c (patch) | |
tree | 0ac280ea474113ef7f33dd18ae4270adcb49dd9b | |
parent | 27dcf445eb66ea032992ff30b3cd36770e1ab929 (diff) | |
parent | cb5f9db47a471620061ccb6a574afc209c610dd2 (diff) | |
download | frameworks_base-ce463847db68afbb796377c6a55209e102774f8c.zip frameworks_base-ce463847db68afbb796377c6a55209e102774f8c.tar.gz frameworks_base-ce463847db68afbb796377c6a55209e102774f8c.tar.bz2 |
Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
-rw-r--r-- | core/java/android/view/View.java | 2 | ||||
-rw-r--r-- | core/java/android/view/ViewGroup.java | 17 |
2 files changed, 0 insertions, 19 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 0148761..f05371a 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -11856,8 +11856,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mCurrentAnimation = null; - resetRtlProperties(); - onRtlPropertiesChanged(LAYOUT_DIRECTION_DEFAULT); resetAccessibilityStateChanged(); } diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 00723f3..dbbcde6 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3620,8 +3620,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager childHasTransientStateChanged(view, false); } - view.resetRtlProperties(); - onViewRemoved(view); needGlobalAttributesUpdate(false); @@ -5372,21 +5370,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @hide */ @Override - public void resetRtlProperties() { - super.resetRtlProperties(); - int count = getChildCount(); - for (int i = 0; i < count; i++) { - final View child = getChildAt(i); - if (child.isLayoutDirectionInherited()) { - child.resetRtlProperties(); - } - } - } - - /** - * @hide - */ - @Override public void resetResolvedLayoutDirection() { super.resetResolvedLayoutDirection(); |