resolved conflicts for merge of 8794c80d to master (5412ba1c) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -11853,8 +11853,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
		@@ -3714,8 +3714,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		childHasTransientStateChanged(view, false);
		}

		view.resetRtlProperties();

		needGlobalAttributesUpdate(false);

		removeFromArray(index);
		@@ -5459,21 +5457,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
		*/