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

Author: ChrisCraik

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;
@@ -210,6 +211,12 @@ public int getOpacity() {
         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

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