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

Commit c3c0c18d authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 73a4aeb9: am 75ae8983: am 48d2bcf2: Reset padding flags when set... 

am 73a4aeb9: am 75ae8983: am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background

* commit '73a4aeb9':
  Reset padding flags when set programmatically or implicitly from background
parents a516481f 73a4aeb9

core/java/android/view/View.java

+18 −4
Original line number Diff line number Diff line
@@ -3672,6 +3672,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 














        boolean startPaddingDefined = false;















        boolean endPaddingDefined = false;













        boolean leftPaddingDefined = false;













        boolean rightPaddingDefined = false;





























        final int targetSdkVersion = context.getApplicationInfo().targetSdkVersion;























@@ -3686,13 +3688,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                    padding = a.getDimensionPixelSize(attr, -1);















                    mUserPaddingLeftInitial = padding;















                    mUserPaddingRightInitial = padding;













                    mLeftPaddingDefined = true;













                    mRightPaddingDefined = true;













                    leftPaddingDefined = true;













                    rightPaddingDefined = true;















                    break;















                 case com.android.internal.R.styleable.View_paddingLeft:















                    leftPadding = a.getDimensionPixelSize(attr, -1);















                    mUserPaddingLeftInitial = leftPadding;













                    mLeftPaddingDefined = true;













                    leftPaddingDefined = true;















                    break;















                case com.android.internal.R.styleable.View_paddingTop:















                    topPadding = a.getDimensionPixelSize(attr, -1);









@@ -3700,7 +3702,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                case com.android.internal.R.styleable.View_paddingRight:















                    rightPadding = a.getDimensionPixelSize(attr, -1);















                    mUserPaddingRightInitial = rightPadding;













                    mRightPaddingDefined = true;













                    rightPaddingDefined = true;















                    break;















                case com.android.internal.R.styleable.View_paddingBottom:















                    bottomPadding = a.getDimensionPixelSize(attr, -1);










@@ -4003,6 +4005,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













            setBackground(background);















        }



























        // setBackground above will record that padding is currently provided by the background.













        // If we have padding specified via xml, record that here instead and use it.













        mLeftPaddingDefined = leftPaddingDefined;













        mRightPaddingDefined = rightPaddingDefined;



























        if (padding >= 0) {















            leftPadding = padding;















            topPadding = padding;










@@ -15461,6 +15468,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                        mUserPaddingRightInitial = padding.right;















                        internalSetPadding(padding.left, padding.top, padding.right, padding.bottom);















                }













                mLeftPaddingDefined = false;













                mRightPaddingDefined = false;















            }





























            // Compare the minimum sizes of the old Drawable and the new.  If there isn't an old or










@@ -15557,6 +15566,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        mUserPaddingLeftInitial = left;















        mUserPaddingRightInitial = right;



























        mLeftPaddingDefined = true;













        mRightPaddingDefined = true;



























        internalSetPadding(left, top, right, bottom);















    }
























@@ -15642,6 +15654,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,



























        mUserPaddingStart = start;















        mUserPaddingEnd = end;













        mLeftPaddingDefined = true;













        mRightPaddingDefined = true;





























        switch(getLayoutDirection()) {















            case LAYOUT_DIRECTION_RTL: