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

Commit 23b82af4 authored by Nader Jawad's avatar Nader Jawad Committed by Android (Google) Code Review
Browse files

Merge "Fix AdaptiveIconDrawable#getAlpha"

parents 1ca78d61 c0a315a1

graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java

+2 −5
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback 


    @Override

    public int getAlpha() {

        return PixelFormat.TRANSLUCENT;

        return mPaint.getAlpha();

    }



    @Override
@@ -714,10 +714,7 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback 


    @Override

    public int getOpacity() {

        if (mLayerState.mOpacityOverride != PixelFormat.UNKNOWN) {

            return mLayerState.mOpacityOverride;

        }

        return mLayerState.getOpacity();

        return PixelFormat.TRANSLUCENT;

    }



    @Override