Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8794c80d authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am a9854ce9: am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is... 

am a9854ce9: am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev

* commit 'a9854ce9':
  Fix bug #7651552 resetRtlProperties() is called way too often
parents d6803668 a9854ce9

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();















    }















































core/java/android/view/ViewGroup.java



+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















     */