Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chris Craik
2014-09-29 22:20:42 +00:00
committed by Android (Google) Code Review
parent df61d0046c 3f873d8644
commit e910cc8838
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/java/android/graphics/drawable/ColorDrawable.java
View File

@@ -16,6 +16,7 @@
package android.graphics.drawable; package android.graphics.drawable;
import android.annotation.NonNull;
import android.graphics.*; import android.graphics.*;
import android.graphics.PorterDuff.Mode; import android.graphics.PorterDuff.Mode;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
@@ -210,6 +211,12 @@ public class ColorDrawable extends Drawable {
return PixelFormat.TRANSLUCENT; return PixelFormat.TRANSLUCENT;
} }
@Override
public void getOutline(@NonNull Outline outline) {
outline.setRect(getBounds());
outline.setAlpha(getAlpha() / 255.0f);
}
@Override @Override
public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme) public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)
throws XmlPullParserException, IOException { throws XmlPullParserException, IOException {

2
graphics/java/android/graphics/drawable/Drawable.java
View File

@@ -895,7 +895,7 @@ public abstract class Drawable {
*/ */
public void getOutline(@NonNull Outline outline) { public void getOutline(@NonNull Outline outline) {
outline.setRect(getBounds()); outline.setRect(getBounds());
outline.setAlpha(getAlpha() / 255.0f); outline.setAlpha(0);
} }
/** /**