diff options
| author | Diego Perez <diegoperez@google.com> | 2015-06-15 09:36:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 09:36:39 +0000 |
| commit | 1f33bdad98dd5138f887642d39c9495e1d7df14b (patch) | |
| tree | 954cfbd6a64c265215c8fe97c83ea396b3b5f575 /tools/layoutlib | |
| parent | b2411c622cf9124f6af5f70d416adb179f9c88bb (diff) | |
| parent | 5e50e00c663a5d0b11d1f41509e1fb4e56d166f1 (diff) | |
| download | frameworks_base-1f33bdad98dd5138f887642d39c9495e1d7df14b.zip frameworks_base-1f33bdad98dd5138f887642d39c9495e1d7df14b.tar.gz frameworks_base-1f33bdad98dd5138f887642d39c9495e1d7df14b.tar.bz2 | |
am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '5e50e00c663a5d0b11d1f41509e1fb4e56d166f1':
Fix for shadows on theme editor
Diffstat (limited to 'tools/layoutlib')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java | 4 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java index 703719c..cbc30c3 100644 --- a/tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java @@ -23,6 +23,8 @@ import com.android.tools.layoutlib.annotations.LayoutlibDelegate; import android.graphics.Shader.TileMode; +import java.awt.image.ColorModel; + /** * Delegate implementing the native methods of android.graphics.LinearGradient * @@ -158,7 +160,7 @@ public final class LinearGradient_Delegate extends Gradient_Delegate { java.awt.image.ColorModel colorModel) { mCanvasMatrix = canvasMatrix; mLocalMatrix = localMatrix; - mColorModel = colorModel; + mColorModel = colorModel.hasAlpha() ? colorModel : ColorModel.getRGBdefault(); } @Override diff --git a/tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java index 6edb140..750580b 100644 --- a/tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java @@ -23,6 +23,8 @@ import com.android.tools.layoutlib.annotations.LayoutlibDelegate; import android.graphics.Shader.TileMode; +import java.awt.image.ColorModel; + /** * Delegate implementing the native methods of android.graphics.RadialGradient * @@ -146,7 +148,7 @@ public class RadialGradient_Delegate extends Gradient_Delegate { java.awt.image.ColorModel colorModel) { mCanvasMatrix = canvasMatrix; mLocalMatrix = localMatrix; - mColorModel = colorModel; + mColorModel = colorModel.hasAlpha() ? colorModel : ColorModel.getRGBdefault(); } @Override |