Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev (ce463847) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -11856,8 +11856,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		mCurrentAnimation = null;

		resetRtlProperties();
		onRtlPropertiesChanged(LAYOUT_DIRECTION_DEFAULT);
		resetAccessibilityStateChanged();
		}

+0 −17

Original line number	Diff line number	Diff line
		@@ -3620,8 +3620,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		childHasTransientStateChanged(view, false);
		}

		view.resetRtlProperties();

		onViewRemoved(view);

		needGlobalAttributesUpdate(false);
		@@ -5368,21 +5366,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
		*/