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

am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

Browse Source 
* commit '13c06d6c91e67962b7ffdf92c56e3b01125e4a8d':
  Fix for shadows on theme editor
This commit is contained in:
Diego Perez
2015-06-15 10:04:02 +00:00
committed by Android Git Automerger
parent df6f63badf 13c06d6c91
commit 2f7103565c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java
View File

@@ -23,6 +23,8 @@ import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import android.graphics.Shader.TileMode; import android.graphics.Shader.TileMode;
import java.awt.image.ColorModel;
/** /**
* Delegate implementing the native methods of android.graphics.LinearGradient * 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) { java.awt.image.ColorModel colorModel) {
mCanvasMatrix = canvasMatrix; mCanvasMatrix = canvasMatrix;
mLocalMatrix = localMatrix; mLocalMatrix = localMatrix;
mColorModel = colorModel; mColorModel = colorModel.hasAlpha() ? colorModel : ColorModel.getRGBdefault();
} }
@Override @Override

4
tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java
View File

@@ -23,6 +23,8 @@ import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import android.graphics.Shader.TileMode; import android.graphics.Shader.TileMode;
import java.awt.image.ColorModel;
/** /**
* Delegate implementing the native methods of android.graphics.RadialGradient * 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) { java.awt.image.ColorModel colorModel) {
mCanvasMatrix = canvasMatrix; mCanvasMatrix = canvasMatrix;
mLocalMatrix = localMatrix; mLocalMatrix = localMatrix;
mColorModel = colorModel; mColorModel = colorModel.hasAlpha() ? colorModel : ColorModel.getRGBdefault();
} }
@Override @Override