Skip to content

Commit ce46384

Browse files
Fabrice Di MeglioAndroid (Google) Code Review
authored andcommitted
Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
2 parents 27dcf44 + cb5f9db commit ce46384

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

core/java/android/view/View.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11856,8 +11856,6 @@ protected void onDetachedFromWindow() {
1185611856

1185711857
mCurrentAnimation = null;
1185811858

11859-
resetRtlProperties();
11860-
onRtlPropertiesChanged(LAYOUT_DIRECTION_DEFAULT);
1186111859
resetAccessibilityStateChanged();
1186211860
}
1186311861

core/java/android/view/ViewGroup.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3620,8 +3620,6 @@ private void removeViewInternal(int index, View view) {
36203620
childHasTransientStateChanged(view, false);
36213621
}
36223622

3623-
view.resetRtlProperties();
3624-
36253623
onViewRemoved(view);
36263624

36273625
needGlobalAttributesUpdate(false);
@@ -5368,21 +5366,6 @@ public void resolveLayoutParams() {
53685366
}
53695367
}
53705368

5371-
/**
5372-
* @hide
5373-
*/
5374-
@Override
5375-
public void resetRtlProperties() {
5376-
super.resetRtlProperties();
5377-
int count = getChildCount();
5378-
for (int i = 0; i < count; i++) {
5379-
final View child = getChildAt(i);
5380-
if (child.isLayoutDirectionInherited()) {
5381-
child.resetRtlProperties();
5382-
}
5383-
}
5384-
}
5385-
53865369
/**
53875370
* @hide
53885371
*/

0 commit comments

Comments
 (0)