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

Commit ac1f5884 authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix CTS test for nine patch padding sanity check 

BUG: 16826969
Change-Id: I96628a38300dec58eb8523559741c28fed35eba2
parent bcc48b6c

graphics/java/android/graphics/drawable/NinePatchDrawable.java

+12 −7
Original line number Diff line number Diff line
@@ -626,13 +626,18 @@ public class NinePatchDrawable extends Drawable { 
            mAutoMirrored = autoMirror;



            // Sanity check for valid padding when we have optical insets.

            if (mPadding.left < mOpticalInsets.left) {

                mPadding.left = mOpticalInsets.left;

                mPadding.right = mOpticalInsets.right;

            if (!opticalInsets.isEmpty()) {

                if (mPadding == null) {

                    mPadding = new Rect();

                }

                if (mPadding.left < opticalInsets.left) {

                    mPadding.left = opticalInsets.left;

                    mPadding.right = opticalInsets.right;

                }

                if (mPadding.top < opticalInsets.top) {

                    mPadding.top = opticalInsets.top;

                    mPadding.bottom = opticalInsets.bottom;

                }

            if (mPadding.top < mOpticalInsets.top) {

                mPadding.top = mOpticalInsets.top;

                mPadding.bottom = mOpticalInsets.bottom;

            }

        }