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

Commit 9c665833 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix default gravity for View foreground drawables"

parents 1ad5cc3c 6579f509

core/java/android/view/View.java

+3 −2
Original line number Diff line number Diff line
@@ -3196,9 +3196,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    private static class ForegroundInfo {

        private Drawable mDrawable;

        private TintInfo mTintInfo;

        private int mGravity = Gravity.START | Gravity.TOP;

        private int mGravity = Gravity.FILL;

        private boolean mInsidePadding = true;

        private boolean mBoundsChanged;

        private boolean mBoundsChanged = true;

        private final Rect mSelfBounds = new Rect();

        private final Rect mOverlayBounds = new Rect();

    }
@@ -16674,6 +16674,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        }















        mForegroundInfo.mDrawable = foreground;













        mForegroundInfo.mBoundsChanged = true;















        if (foreground != null) {















            setWillNotDraw(false);















            foreground.setCallback(this);