From 0a1c6f021be032f5aecb341c2794efb06c0a8a0d Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 21 May 2014 18:10:53 -0700
Subject: Style and asset cleanup

Updates button drawable and colors, cleans up Quantum styles, updates
highlight attribute name and color, fixes popup backgrounds.

Also fixes GradientDrawable opacity check.

Change-Id: I75dd35e815a8a33ec9f0b16e881e774edfb8c092
---
 graphics/java/android/graphics/drawable/GradientDrawable.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'graphics')

diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index 4a4a06b..f82acc3 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -818,7 +818,8 @@ public class GradientDrawable extends Drawable {
 
     @Override
     public int getOpacity() {
-        return mGradientState.mOpaque ? PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT;
+        return (mAlpha == 255 && mGradientState.mOpaque) ?
+                PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT;
     }
 
     @Override
-- 
cgit v1.1