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

Merge "Always project ripples" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-10-13 20:58:47 +00:00
committed by Android (Google) Code Review
parent 9ca39d744c f90b6bd54f
commit 2f82e48abb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -348,7 +348,8 @@ public class RippleDrawable extends LayerDrawable {
*/ */
@Override @Override
public boolean isProjected() { public boolean isProjected() {
return getNumberOfLayers() == 0; // Always project ripples. We'll handle bounding in draw().
return true;
} }
@Override @Override
@@ -851,7 +852,7 @@ public class RippleDrawable extends LayerDrawable {
@Override @Override
public Rect getDirtyBounds() { public Rect getDirtyBounds() {
if (isProjected()) { if (getNumberOfLayers() == 0) {
final Rect drawingBounds = mDrawingBounds; final Rect drawingBounds = mDrawingBounds;
final Rect dirtyBounds = mDirtyBounds; final Rect dirtyBounds = mDirtyBounds;
dirtyBounds.set(drawingBounds); dirtyBounds.set(drawingBounds);