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

Commit 343e1134 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #6427629 Clean up layout direction APIs 

- remove onPaddingChanged(int) and fold it into onRtlPropertiesChanged(int)

Change-Id: I1d7f02d2b4538c6c991bd4285501bbc73e6aa5c3
parent 15bbde41

api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -25093,10 +25093,9 @@ package android.view { 
    method protected void onLayout(boolean, int, int, int, int);

    method protected void onMeasure(int, int);

    method protected void onOverScrolled(int, int, boolean, boolean);

    method public void onPaddingChanged(int);

    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method protected void onRestoreInstanceState(android.os.Parcelable);

    method public void onRtlPropertiesChanged();

    method public void onRtlPropertiesChanged(int);

    method protected android.os.Parcelable onSaveInstanceState();

    method public void onScreenStateChanged(int);

    method protected void onScrollChanged(int, int, int, int);

core/java/android/view/View.java

+11 −19
Original line number Diff line number Diff line
@@ -11560,7 +11560,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        }

        requestLayout();

        invalidate(true);

        onRtlPropertiesChanged();

        onRtlPropertiesChanged(getLayoutDirection());

    }















    // Reset resolution of all RTL related properties.










@@ -11622,8 +11622,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * resolved layout direction, or to inform child views that inherit their layout direction.















     *















     * The default implementation does nothing.













     *













     * @param layoutDirection the direction of the layout













     *













     * @see #LAYOUT_DIRECTION_LTR













     * @see #LAYOUT_DIRECTION_RTL















     */













    public void onRtlPropertiesChanged() {













    public void onRtlPropertiesChanged(int layoutDirection) {















    }





























    /**










@@ -11768,7 +11773,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,



























            internalSetPadding(mUserPaddingLeft, mPaddingTop, mUserPaddingRight,















                    mUserPaddingBottom);













            onPaddingChanged(resolvedLayoutDirection);













            onRtlPropertiesChanged(resolvedLayoutDirection);















        }





























        mPrivateFlags2 |= PFLAG2_PADDING_RESOLVED;









@@ -11783,19 +11788,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        mPrivateFlags2 &= ~PFLAG2_PADDING_RESOLVED;















    }



























    /**













     * Resolve padding depending on the layout direction. Subclasses that care about













     * padding resolution should override this method. The default implementation does













     * nothing.













     *













     * @param layoutDirection the direction of the layout













     *













     * @see #LAYOUT_DIRECTION_LTR













     * @see #LAYOUT_DIRECTION_RTL













     */













    public void onPaddingChanged(int layoutDirection) {













    }



























    /**















     * This is called when the view is detached from a window.  At this point it















     * no longer has a surface for drawing.










@@ -11827,7 +11819,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        mCurrentAnimation = null;





























        resetRtlProperties();













        onRtlPropertiesChanged();













        onRtlPropertiesChanged(LAYOUT_DIRECTION_DEFAULT);















        resetAccessibilityStateChanged();















    }
























@@ -16618,7 +16610,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













            // Do resolution















            resolveTextDirection();















            // Notify change













            onRtlPropertiesChanged();













            onRtlPropertiesChanged(getLayoutDirection());















            // Refresh















            requestLayout();















            invalidate(true);










@@ -16812,7 +16804,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













            // Do resolution















            resolveTextAlignment();















            // Notify change













            onRtlPropertiesChanged();













            onRtlPropertiesChanged(getLayoutDirection());















            // Refresh















            requestLayout();















            invalidate(true);

























core/java/android/widget/CheckedTextView.java



+4
−9






























Original line number
Diff line number
Diff line








@@ -184,13 +184,8 @@ public class CheckedTextView extends TextView implements Checkable {













    }































    @Override













    public void onPaddingChanged(int layoutDirection) {













        updatePadding();













    }



























    @Override













    public void onRtlPropertiesChanged() {













        super.onRtlPropertiesChanged();













    public void onRtlPropertiesChanged(int layoutDirection) {













        super.onRtlPropertiesChanged(layoutDirection);















        updatePadding();















    }

















































core/java/android/widget/SearchView.java



+2
−2






























Original line number
Diff line number
Diff line








@@ -1354,8 +1354,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {













    };































    @Override













    public void onRtlPropertiesChanged() {













        mQueryTextView.setLayoutDirection(getLayoutDirection());













    public void onRtlPropertiesChanged(int layoutDirection) {













        mQueryTextView.setLayoutDirection(layoutDirection);















    }































    /**

































core/java/android/widget/TextView.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -5635,7 +5635,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener













    }































    @Override













    public void onRtlPropertiesChanged() {













    public void onRtlPropertiesChanged(int layoutDirection) {















        if (mLayoutAlignment != null) {















            if (mResolvedTextAlignment == TEXT_ALIGNMENT_VIEW_START ||















                    mResolvedTextAlignment == TEXT_ALIGNMENT_VIEW_END) {