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

Commit eba0a750 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev 

automerge: 91a1a729

* commit '91a1a729':
  Clean up GradientDrawable styled attributes, fix useLevelForShape
parents 928debf5 91a1a729

graphics/java/android/graphics/drawable/GradientDrawable.java

+9 −8
Original line number Diff line number Diff line
@@ -1552,14 +1552,15 @@ public class GradientDrawable extends Drawable { 
        public int mThickness = -1;

        public boolean mDither = false;



        private float mCenterX = 0.5f;

        private float mCenterY = 0.5f;

        private float mGradientRadius = 0.5f;

        private int mGradientRadiusType = RADIUS_TYPE_PIXELS;

        private boolean mUseLevel;

        private boolean mUseLevelForShape;

        private boolean mOpaqueOverBounds;

        private boolean mOpaqueOverShape;

        float mCenterX = 0.5f;

        float mCenterY = 0.5f;

        float mGradientRadius = 0.5f;

        int mGradientRadiusType = RADIUS_TYPE_PIXELS;

        boolean mUseLevel = false;

        boolean mUseLevelForShape = true;



        boolean mOpaqueOverBounds;

        boolean mOpaqueOverShape;



        ColorStateList mTint = null;

        PorterDuff.Mode mTintMode = DEFAULT_TINT_MODE;