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

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

am 505c9d2c: am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev 

* commit '505c9d2c':
  Implement alpha as documented for drawables
parents b90269b0 505c9d2c

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);

    }



    /**