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

am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev

Browse Source 
* commit 'f5a99437bf203eca49e8ab8f74f2c206c551289b':
  Fix crash when shadowSize is 0
This commit is contained in:
Diego Perez
2015-06-12 14:45:21 +00:00
committed by Android Git Automerger
parent 7ffde4a630 f5a99437bf
commit 6815598650
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/layoutlib/bridge/src/android/view/ShadowPainter.java
View File

@@ -34,12 +34,15 @@ public class ShadowPainter {
* new image. This method attempts to mimic the same visual characteristics as the rectangular * new image. This method attempts to mimic the same visual characteristics as the rectangular
* shadow painting methods in this class, {@link #createRectangularDropShadow(java.awt.image.BufferedImage)} * shadow painting methods in this class, {@link #createRectangularDropShadow(java.awt.image.BufferedImage)}
* and {@link #createSmallRectangularDropShadow(java.awt.image.BufferedImage)}. * and {@link #createSmallRectangularDropShadow(java.awt.image.BufferedImage)}.
* <p/>
* If shadowSize is less or equals to 1, no shadow will be painted and the source image will be
* returned instead.
* *
* @param source the source image * @param source the source image
* @param shadowSize the size of the shadow, normally {@link #SHADOW_SIZE or {@link * @param shadowSize the size of the shadow, normally {@link #SHADOW_SIZE or {@link
* #SMALL_SHADOW_SIZE}} * #SMALL_SHADOW_SIZE}}
* *
* @return a new image with the shadow painted in * @return an image with the shadow painted in or the source image if shadowSize <= 1
*/ */
@NonNull @NonNull
public static BufferedImage createDropShadow(BufferedImage source, int shadowSize) { public static BufferedImage createDropShadow(BufferedImage source, int shadowSize) {
@@ -60,11 +63,15 @@ public class ShadowPainter {
* @param shadowOpacity the opacity of the shadow, with 0=transparent and 1=opaque * @param shadowOpacity the opacity of the shadow, with 0=transparent and 1=opaque
* @param shadowRgb the RGB int to use for the shadow color * @param shadowRgb the RGB int to use for the shadow color
* *
* @return a new image with the source image on top of its shadow * @return a new image with the source image on top of its shadow when shadowSize > 0 or the
* source image otherwise
*/ */
@SuppressWarnings({"SuspiciousNameCombination", "UnnecessaryLocalVariable"}) // Imported code @SuppressWarnings({"SuspiciousNameCombination", "UnnecessaryLocalVariable"}) // Imported code
public static BufferedImage createDropShadow(BufferedImage source, int shadowSize, public static BufferedImage createDropShadow(BufferedImage source, int shadowSize,
float shadowOpacity, int shadowRgb) { float shadowOpacity, int shadowRgb) {
if (shadowSize <= 0) {
return source;
}
// This code is based on // This code is based on
// http://www.jroller.com/gfx/entry/non_rectangular_shadow // http://www.jroller.com/gfx/entry/non_rectangular_shadow