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

Commit e910cc88 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Implement alpha as documented for drawables" into lmp-dev

parents df61d004 3f873d86

graphics/java/android/graphics/drawable/ColorDrawable.java

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.graphics.drawable;



import android.annotation.NonNull;

import android.graphics.*;

import android.graphics.PorterDuff.Mode;

import android.content.res.ColorStateList;
@@ -210,6 +211,12 @@ public class ColorDrawable extends Drawable { 
        return PixelFormat.TRANSLUCENT;

    }



    @Override

    public void getOutline(@NonNull Outline outline) {

        outline.setRect(getBounds());

        outline.setAlpha(getAlpha() / 255.0f);

    }



    @Override

    public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)

            throws XmlPullParserException, IOException {

graphics/java/android/graphics/drawable/Drawable.java

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ public abstract class Drawable { 
     */

    public void getOutline(@NonNull Outline outline) {

        outline.setRect(getBounds());

        outline.setAlpha(getAlpha() / 255.0f);

        outline.setAlpha(0);

    }



    /**