Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev

Fabrice Di Meglio · Android (Google) Code Review · commit 161cfef36d8f · 2012-10-17T11:13:20.000-07:00
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
@@ -3383,7 +3383,7 @@ private void addViewInner(View child, int index, LayoutParams params,
         }
 
         if (child.isLayoutDirectionInherited()) {
-            child.resetResolvedLayoutDirection();
+            child.resetRtlProperties();
             child.resolveRtlPropertiesIfNeeded();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -3383,7 +3383,7 @@ private void addViewInner(View child, int index, LayoutParams params,`
`3383`	`3383`	`}`
`3384`	`3384`
`3385`	`3385`	`if (child.isLayoutDirectionInherited()) {`
`3386`		`- child.resetResolvedLayoutDirection();`
	`3386`	`+ child.resetRtlProperties();`
`3387`	`3387`	`child.resolveRtlPropertiesIfNeeded();`
`3388`	`3388`	`}`
`3389`	`3389`