diff options
| author | Chris Craik <ccraik@google.com> | 2014-09-30 14:55:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-30 14:55:26 +0000 |
| commit | 75533864ac22603c2474c4e21e9cf64ed6ed7322 (patch) | |
| tree | 458f9b32161e4c96f759532bba03de79b2902c77 /graphics/java | |
| parent | d072fe8ef08890c796349edf7e79381b667c9849 (diff) | |
| parent | e910cc88387f49b119bb2f8e579849864970ac87 (diff) | |
| download | frameworks_base-75533864ac22603c2474c4e21e9cf64ed6ed7322.zip frameworks_base-75533864ac22603c2474c4e21e9cf64ed6ed7322.tar.gz frameworks_base-75533864ac22603c2474c4e21e9cf64ed6ed7322.tar.bz2 | |
am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev
* commit 'e910cc88387f49b119bb2f8e579849864970ac87':
Implement alpha as documented for drawables
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/drawable/ColorDrawable.java | 7 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/Drawable.java | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java index 33225ce..0608065 100644 --- a/graphics/java/android/graphics/drawable/ColorDrawable.java +++ b/graphics/java/android/graphics/drawable/ColorDrawable.java @@ -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; @@ -211,6 +212,12 @@ public class ColorDrawable extends Drawable { } @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 { super.inflate(r, parser, attrs, theme); diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index 43a9eaa..9ae788c 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -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); } /** |