Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa04b7c2 authored by Diego Perez's avatar Diego Perez Committed by Android Git Automerger
Browse files

am 898be8bc: am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c:... 

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

* commit '898be8bc':
  Fix for shadows on theme editor
parents 878d0553 898be8bc

tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -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

tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -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