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

Commit 1d0b13b7 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am db05ea90: am d2c05188: Merge "Fix build - Revert "Revert "Use default... 

am db05ea90: am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev

* commit 'db05ea90':
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
parents 80beff6d db05ea90

core/java/android/widget/Editor.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -4475,7 +4475,7 @@ public class Editor { 




    private class CorrectionHighlighter {

    private class CorrectionHighlighter {

        private final Path mPath = new Path();

        private final Path mPath = new Path();

        private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);

        private final Paint mPaint = new Paint();

        private int mStart, mEnd;

        private int mStart, mEnd;

        private long mFadingStartTime;

        private long mFadingStartTime;

        private RectF mTempRectF;

        private RectF mTempRectF;

core/java/android/widget/Switch.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ public class Switch extends CompoundButton { 
    public Switch(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

    public Switch(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        super(context, attrs, defStyleAttr, defStyleRes);





        mTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);

        mTextPaint = new TextPaint();





        final Resources res = getResources();

        final Resources res = getResources();

        mTextPaint.density = res.getDisplayMetrics().density;

        mTextPaint.density = res.getDisplayMetrics().density;

core/java/android/widget/TextView.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -669,11 +669,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        final Resources res = getResources();

        final Resources res = getResources();

        final CompatibilityInfo compat = res.getCompatibilityInfo();

        final CompatibilityInfo compat = res.getCompatibilityInfo();





        mTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);

        mTextPaint = new TextPaint();

        mTextPaint.density = res.getDisplayMetrics().density;

        mTextPaint.density = res.getDisplayMetrics().density;

        mTextPaint.setCompatibilityScaling(compat.applicationScale);

        mTextPaint.setCompatibilityScaling(compat.applicationScale);





        mHighlightPaint = new Paint(Paint.ANTI_ALIAS_FLAG);

        mHighlightPaint = new Paint();

        mHighlightPaint.setCompatibilityScaling(compat.applicationScale);

        mHighlightPaint.setCompatibilityScaling(compat.applicationScale);





        mMovement = getDefaultMovementMethod();

        mMovement = getDefaultMovementMethod();

core/java/com/android/internal/util/ImageUtils.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ public class ImageUtils { 
                        COMPACT_BITMAP_SIZE, COMPACT_BITMAP_SIZE, Bitmap.Config.ARGB_8888

                        COMPACT_BITMAP_SIZE, COMPACT_BITMAP_SIZE, Bitmap.Config.ARGB_8888

                );

                );

                mTempCompactBitmapCanvas = new Canvas(mTempCompactBitmap);

                mTempCompactBitmapCanvas = new Canvas(mTempCompactBitmap);

                mTempCompactBitmapPaint = new Paint(Paint.ANTI_ALIAS_FLAG);

                mTempCompactBitmapPaint = new Paint();

                mTempCompactBitmapPaint.setFilterBitmap(true);

                mTempCompactBitmapPaint.setFilterBitmap(true);

            }

            }

            mTempMatrix.reset();

            mTempMatrix.reset();

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -133,7 +133,7 @@ public class GradientDrawable extends Drawable { 




    private GradientState mGradientState;

    private GradientState mGradientState;





    private final Paint mFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);

    private final Paint mFillPaint = new Paint();

    private Rect mPadding;

    private Rect mPadding;

    private Paint mStrokePaint;   // optional, set by the caller

    private Paint mStrokePaint;   // optional, set by the caller

    private ColorFilter mColorFilter;   // optional, set by the caller

    private ColorFilter mColorFilter;   // optional, set by the caller
@@ -323,7 +323,7 @@ public class GradientDrawable extends Drawable { 




    private void setStrokeInternal(int width, int color, float dashWidth, float dashGap) {

    private void setStrokeInternal(int width, int color, float dashWidth, float dashGap) {

        if (mStrokePaint == null)  {

        if (mStrokePaint == null)  {

            mStrokePaint = new Paint(Paint.ANTI_ALIAS_FLAG);

            mStrokePaint = new Paint();

            mStrokePaint.setStyle(Paint.Style.STROKE);

            mStrokePaint.setStyle(Paint.Style.STROKE);

        }

        }

        mStrokePaint.setStrokeWidth(width);

        mStrokePaint.setStrokeWidth(width);
@@ -1802,7 +1802,7 @@ public class GradientDrawable extends Drawable { 
        mPadding = state.mPadding;

        mPadding = state.mPadding;





        if (state.mStrokeWidth >= 0) {

        if (state.mStrokeWidth >= 0) {

            mStrokePaint = new Paint(Paint.ANTI_ALIAS_FLAG);

            mStrokePaint = new Paint();

            mStrokePaint.setStyle(Paint.Style.STROKE);

            mStrokePaint.setStyle(Paint.Style.STROKE);

            mStrokePaint.setStrokeWidth(state.mStrokeWidth);

            mStrokePaint.setStrokeWidth(state.mStrokeWidth);